compile

diff --git a/zypp/cache/SourceCache.cpp b/zypp/cache/SourceCache.cpp
index 9a164c90c429759952e27429931d550028d7c9c4..cc1cc163f51e826bc7c84d35a09fbfb601a58d4b 100644 (file)
--- a/zypp/cache/SourceCache.cpp
+++ b/zypp/cache/SourceCache.cpp
@@ -27,7 +27,7 @@ namespace zypp
 namespace cache
 { /////////////////////////////////////////////////////////////////
 
-static int int_to_tribool( boost::tribool b )
+static int tribool_to_int( boost::tribool b )
 {
   if (b)
     return 1;
@@ -37,19 +37,19 @@ static int int_to_tribool( boost::tribool b )
     return 2;
 }  
   
-static boost::tribool b tribool_to_int( int i )
+static boost::tribool int_to_tribool( int i )
 {
   if (i==1)
     return true;
   else if (i==0)
     return false;
   else
-    return boost;indeterminate;
+    return boost::indeterminate;
 }
   
 static std::string checksum_to_string( const CheckSum &checksum )
 {
-  return checksum.type() + ":" checksum.checksum();
+  return checksum.type() + ":" + checksum.checksum();
 }  
   
 static CheckSum string_to_checksum( const std::string &checksum )
@@ -58,7 +58,7 @@ static CheckSum string_to_checksum( const std::string &checksum )
   if ( str::split( checksum, std::back_inserter(words), ":" ) != 2 )
     return CheckSum();
   
-  return CheckSum( words[0], words[19);
+  return CheckSum( words[0], words[19]);
 }
   
 #define SOURCES_TABLE_SCHEMA "create table sources ( alias varchar primary key, type varchar, description varchar,  url varchar, path varchar,  enabled integer, autorefresh integer, timestamp varchar, checksum varchar);"   
@@ -128,7 +128,7 @@ source::SourceInfoList SourceCache::knownSources() const
         info.setPath(reader.getstring(4));
         info.setEnabled( int_to_tribool(reader.getint(5)) );
         info.setAutorefresh( int_to_tribool( reader.getint(6) ));
-        info.setTimestamp(reader.getstring(7));
+        //info.setTimestamp(Date(reader.getstring(7)));
         info.setChecksum(string_to_checksum(reader.getstring(8)));
         sources.push_back(info);
       }

diff --git a/zypp/source/SourceInfo.cc b/zypp/source/SourceInfo.cc
index adc1862f3b59f607e4c7b4816f1ed34a8dd796a5..48de9b593dbc91a8c7d36320f2f7985fa364f8b1 100644 (file)
--- a/zypp/source/SourceInfo.cc
+++ b/zypp/source/SourceInfo.cc
@@ -94,7 +94,7 @@ namespace source
     return *this;
   }
   
-  SourceInfo & SourceInfo::setTimesamp( const Date &timestamp )
+  SourceInfo & SourceInfo::setTimestamp( const Date &timestamp )
   {
     _timestamp = timestamp;
     return *this;

diff --git a/zypp/source/SourceInfo.h b/zypp/source/SourceInfo.h
index 99544ce0d075fd93ba16a7d261b2fc62a6c0d7d9..12ec19b8f8d0aa49269d17283cc13d580a89d691 100644 (file)
--- a/zypp/source/SourceInfo.h
+++ b/zypp/source/SourceInfo.h
@@ -43,7 +43,7 @@ namespace source
     SourceInfo & setCacheDir( const Pathname &p );
     SourceInfo & setDescription( const std::string &description );
     SourceInfo & setChecksum( const CheckSum &checksum );
-    SourceInfo & setTimesamp( const Date &timestamp );
+    SourceInfo & setTimestamp( const Date &timestamp );
     boost::tribool enabled() const;
     boost::tribool autorefresh() const;
     Pathname cacheDir() const;