cope with all kinds of resolvables

diff --git a/zmd/backend/dbsource/DbAccess.cc b/zmd/backend/dbsource/DbAccess.cc
index acfc4e0342dc68584ef4e128b7e6e7bf9a180535..677677b9f7722b93d43ab639fc381760ed7fa70e 100644 (file)
--- a/zmd/backend/dbsource/DbAccess.cc
+++ b/zmd/backend/dbsource/DbAccess.cc
@@ -153,9 +153,12 @@ kind2target( Resolvable::Kind kind )
     else if (kind == ResTraits<Selection>::kind) return RC_DEP_TARGET_SELECTION;
     else if (kind == ResTraits<Pattern>::kind)  return RC_DEP_TARGET_PATTERN;
     else if (kind == ResTraits<Product>::kind)  return RC_DEP_TARGET_PRODUCT;
+    else if (kind == ResTraits<Language>::kind)         return RC_DEP_TARGET_LANGUAGE;
+    else if (kind == ResTraits<Atom>::kind)     return RC_DEP_TARGET_ATOM;
+    else if (kind == ResTraits<SrcPackage>::kind) return RC_DEP_TARGET_SRC;
 
     WAR << "Unknown resolvable kind " << kind << endl;
-    return RC_DEP_TARGET_PACKAGE;
+    return RC_DEP_TARGET_UNKNOWN;
 }
 
 //----------------------------------------------------------------------------
@@ -475,6 +478,9 @@ DbAccess::writeDependency( sqlite_int64 res_id, RCDependencyType type, const zyp
 
     for (zypp::CapSet::const_iterator iter = capabilities.begin(); iter != capabilities.end(); ++iter) {
 
+       RCDependencyTarget refers = kind2target( iter->refers() );
+       if (refers == RC_DEP_TARGET_UNKNOWN) continue;
+
        sqlite3_bind_int64( handle, 1, res_id);
        sqlite3_bind_int( handle, 2, type);
        sqlite3_bind_text( handle, 3, iter->index().c_str(), -1, SQLITE_STATIC );
@@ -505,7 +511,7 @@ DbAccess::writeDependency( sqlite_int64 res_id, RCDependencyType type, const zyp
            sqlite3_bind_int( handle, 8, RC_RELATION_NONE );
        }
 
-       sqlite3_bind_int( handle, 9, kind2target( iter->refers() ));
+       sqlite3_bind_int( handle, 9, refers );
 
        rc = sqlite3_step( handle);
        sqlite3_reset( handle);
@@ -835,7 +841,7 @@ DbAccess::writeStore( const zypp::ResStore & store, ResStatus status, const char
     }
 
     int count = 0;
-    sqlite_int64 rowid;
+    sqlite_int64 rowid = 0;
     for (ResStore::const_iterator iter = store.begin(); iter != store.end(); ++iter) {
        rowid = writeResObject( *iter, status, catalog );
        if (rowid < 0)

diff --git a/zmd/backend/dbsource/DbAccess.h b/zmd/backend/dbsource/DbAccess.h
index 75567854495760e8c385925ff257e9bb64c9b8d6..d76e0cf0e6b1384a2834729432e1e702de6b5fdd 100644 (file)
--- a/zmd/backend/dbsource/DbAccess.h
+++ b/zmd/backend/dbsource/DbAccess.h
@@ -107,7 +107,11 @@ typedef enum {
        RC_DEP_TARGET_PATCH,                    // 3
        RC_DEP_TARGET_SELECTION,                // 4
        RC_DEP_TARGET_PATTERN,                  // 5
-       RC_DEP_TARGET_PRODUCT                   // 6
+       RC_DEP_TARGET_PRODUCT,                  // 6
+       RC_DEP_TARGET_LANGUAGE,                 // 7
+       RC_DEP_TARGET_ATOM,                     // 8
+       RC_DEP_TARGET_SRC,                      // 9
+       RC_DEP_TARGET_UNKNOWN=42                // 42
 } RCDependencyTarget;
 
 //-----------------------------------------------------------------------------