stop if no db connection

diff --git a/devel/devel.shaas/PdbToZypp/CMakeLists.txt b/devel/devel.shaas/PdbToZypp/CMakeLists.txt
index ab4a253..6631b20 100644 (file)
--- a/devel/devel.shaas/PdbToZypp/CMakeLists.txt
+++ b/devel/devel.shaas/PdbToZypp/CMakeLists.txt
@@ -4,17 +4,6 @@ SET( LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib" )
 
 SET( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -pipe -O2 -Wall -W -fpic -D_REENTRANT" )
 
-FIND_PROGRAM(SWIG_EXECUTABLE
-  NAMES swig-1.3 swig
-  PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin
-)
-
-IF ( NOT SWIG_EXECUTABLE )
-   MESSAGE( FATAL_ERROR " swig not found" )
-ELSE ( NOT SWIG_EXECUTABLE )
-   MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" )
-ENDIF ( NOT SWIG_EXECUTABLE ) 
-
 FIND_PACKAGE(Zypp REQUIRED)
 IF ( NOT ZYPP_LIBRARY )
    MESSAGE( FATAL_ERROR " zypp not found" )
@@ -42,4 +31,4 @@ TARGET_LINK_LIBRARIES(pdbtozypp -lmysqlclient )
 
 INSTALL(TARGETS pdbtozypp LIBRARY DESTINATION ${LIB_INSTALL_DIR} )
 
-ADD_SUBDIRECTORY(swig)
+#ADD_SUBDIRECTORY(swig)

diff --git a/devel/devel.shaas/PdbToZypp/pdbtozypp.cc b/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
index 9e83f3c..1f2b0ff 100644 (file)
--- a/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
+++ b/devel/devel.shaas/PdbToZypp/pdbtozypp.cc
@@ -12,7 +12,7 @@ PdbToZypp::~PdbToZypp(){
 
 }
 
-void PdbToZypp::readOut(){
+int PdbToZypp::readOut(){
 
    //store = new ResStore;
 
@@ -20,16 +20,15 @@ void PdbToZypp::readOut(){
        database *dbPackages = new database("lorien.suse.de", "rpmread", "rrrrrrr", "package");
 
        if(dbPackages->connect() != 1){
-               //std::cout << "NO DB CONNECTION!!!\n";
-               //return 1;
+               std::cout << "NO DB CONNECTION!!!\n";
+               return 0;
        }
 
        if(dbDeps->connect() != 1){
-               //std::cout << "NO DB CONNECTION!!!\n";
-               //return 1;
+               std::cout << "NO DB CONNECTION!!!\n";
+               return 0;
        }
 
-       //dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID = 10 AND PackStatus IN (0, 6, 7, 8) AND BasedOnID IS NULL");
        dbPackages->sqlexecute("SELECT PackID, PackNameShort, PackStatus FROM Packages WHERE CDReleaseID IN (10, 64) AND PackStatus IN (0, 6, 7, 8) OR PackStatus IS NULL AND BasedOnID IS NULL");
 
        std::vector< std::vector<string> > packIDs = dbPackages->getResult();
@@ -193,6 +192,7 @@ void PdbToZypp::readOut(){
                }*/
 
                store.insert(p);
+      return 1;
        }
 
        dbDeps->close();

diff --git a/devel/devel.shaas/PdbToZypp/pdbtozypp.h b/devel/devel.shaas/PdbToZypp/pdbtozypp.h
index f3923d0..3269283 100644 (file)
--- a/devel/devel.shaas/PdbToZypp/pdbtozypp.h
+++ b/devel/devel.shaas/PdbToZypp/pdbtozypp.h
@@ -15,7 +15,7 @@ class PdbToZypp{
                //PdbToZypp(zypp::ResStore  & _store);
                PdbToZypp();
       ~PdbToZypp();
-      void readOut();
+      int readOut();
       zypp::ResStore getStore();
    private:
       zypp::ResStore store;

diff --git a/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt b/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt
index 26e2546..3ba2557 100644 (file)
--- a/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt
+++ b/devel/devel.shaas/PdbToZypp/swig/CMakeLists.txt
@@ -1,5 +1,19 @@
+PROJECT(swigpdbtozypp)
+
 FIND_PACKAGE(Perl REQUIRED)
 
+FIND_PROGRAM(SWIG_EXECUTABLE
+  NAMES swig-1.3 swig
+  PATHS ${SWIG_DIR} ${SWIG_DIR}/.. ${SWIG_DIR}/../../bin /usr/bin /usr/local/bin ${CMAKE_INSTALL_PREFIX}/bin
+)
+
+IF ( NOT SWIG_EXECUTABLE )
+   MESSAGE( FATAL_ERROR " swig not found" )
+ELSE ( NOT SWIG_EXECUTABLE )
+   MESSAGE( STATUS "SWIG found at ${SWIG_EXECUTABLE}" )
+ENDIF ( NOT SWIG_EXECUTABLE ) 
+
+
 EXECUTE_PROCESS(COMMAND ${PERL_EXECUTABLE} -e "use Config; print \$Config{cppflags}" OUTPUT_VARIABLE PERL_CXX_FLAGS)
 
 SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} ${PERL_CXX_FLAGS}")

diff --git a/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i b/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i
index 62505ba..892ab13 100644 (file)
--- a/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i
+++ b/devel/devel.shaas/PdbToZypp/swig/PdbToZypp.i
@@ -11,7 +11,7 @@ class PdbToZypp{
                //PdbToZypp(zypp::ResStore  & _store);
                PdbToZypp();
       ~PdbToZypp();
-      void readOut();
+      int readOut();
       ResStore getStore();
    private:
       ResStore store;