commit yum-metadata-parser

8 Jan 2007

Hello community,

here is the log from the commit of package yum-metadata-parser
checked in at Mon Jan 8 22:57:43 CET 2007.

--------

--- yum-metadata-parser/yum-metadata-parser.changes	2006-08-05 18:07:04.000000000 +0200
+++ /mounts/work_src_done/STABLE/yum-metadata-parser/yum-metadata-parser.changes	2007-01-08 22:18:28.021848000 +0100
@@ -1,0 +2,14 @@
+Mon Jan  8 22:16:53 CET 2007 - cthiel@suse.de
+
+- update to version 1.0.3
+  * sqlitecache.c: Never use the default glib log handler.  This way, when
+    -d0 is passed, we won't output to the glib log handler (since nothing
+     should be displayed at all).
+
+  * sqlitecachec.py: support newer pysqlite as included in python 2.5
+  * sqlitecache.c: Use structs and function pointers to reduce code
+    duplication.
+  * sqlitecache.c, sqlitecachec.py: Display repoid while populating the
+    cache.
+
+-------------------------------------------------------------------

Old:
----
  yum-metadata-parser-1.0.2.tar.bz2

New:
----
  yum-metadata-parser-1.0.3.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yum-metadata-parser.spec ++++++
--- /var/tmp/diff_new_pack.rW9422/_old	2007-01-08 22:56:38.000000000 +0100
+++ /var/tmp/diff_new_pack.rW9422/_new	2007-01-08 22:56:38.000000000 +0100
@@ -1,7 +1,7 @@
 #
-# spec file for package yum-metadata-parser (Version 1.0.2)
+# spec file for package yum-metadata-parser (Version 1.0.3)
 #
-# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
 # This file and all modifications and additions to the pristine
 # package are under the same license as the package itself.
 #
@@ -13,11 +13,11 @@
 Name:           yum-metadata-parser
 BuildRequires:  glib2-devel libxml2-devel pkgconfig python-devel sqlite-devel
 Summary:        A fast metadata parser for yum
-Version:        1.0.2
+Version:        1.0.3
 Release:        1
 Source:         %{name}-%{version}.tar.bz2
 Patch:          %{name}-1.0-quiet.patch
-License:        GPL
+License:        GNU General Public License (GPL)
 Group:          Development/Libraries/Python
 URL:            http://devel.linux.duke.edu/cgi-bin/viewcvs.cgi/yum-metadata-parser/
 Requires:       yum >= 2.6.2
@@ -54,6 +54,16 @@
 %{py_sitedir}/*
 
 %changelog -n yum-metadata-parser
+* Mon Jan 08 2007 - cthiel@suse.de
+- update to version 1.0.3
+  * sqlitecache.c: Never use the default glib log handler.  This way, when
+    -d0 is passed, we won't output to the glib log handler (since nothing
+  should be displayed at all).
+  * sqlitecachec.py: support newer pysqlite as included in python 2.5
+  * sqlitecache.c: Use structs and function pointers to reduce code
+  duplication.
+  * sqlitecache.c, sqlitecachec.py: Display repoid while populating the
+  cache.
 * Sat Aug 05 2006 - cthiel@suse.de
 - added yum-metadata-parser-1.0-quiet.patch from Fedora
 * Sat Aug 05 2006 - cthiel@suse.de

++++++ yum-metadata-parser-1.0.2.tar.bz2 -> yum-metadata-parser-1.0.3.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.2/ChangeLog new/yum-metadata-parser-1.0.3/ChangeLog
--- old/yum-metadata-parser-1.0.2/ChangeLog	2006-07-12 07:38:31.000000000 +0200
+++ new/yum-metadata-parser-1.0.3/ChangeLog	2007-01-07 21:34:09.000000000 +0100
@@ -1,3 +1,37 @@
+2007-01-07 15:31  skvidal
+
+	* setup.py, yum-metadata-parser.spec: 
+	mark as 1.0.3
+
+2007-01-04 13:20  jbowes
+
+	* ChangeLog, sqlitecache.c: 2007-12-04 13:10 jbowes
+	
+		* sqlitecache.c: Never use the default glib log handler.
+	This way, when
+		-d0 is passed, we won't output to the glib log handler
+	(since nothing
+		should be displayed at all).
+
+2006-12-05 15:50  katzj
+
+	* sqlitecachec.py: support newer pysqlite as included in python 2.5
+
+2006-11-22 20:28  jbowes
+
+	* ChangeLog, sqlitecache.c: Use structs and function pointers to
+	reduce code duplication.
+
+2006-11-22 20:22  jbowes
+
+	* ChangeLog, sqlitecache.c, sqlitecachec.py: Display repoid while
+	populating the cache.
+
+2006-07-12 01:40  skvidal
+
+	* ChangeLog, setup.py, yum-metadata-parser.spec: 
+	version bump check in changelog
+
 2006-07-10 12:54  pnasrat
 
 	* db.c, db.h: Move to dbversion 9 - add pre for requires
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.2/PKG-INFO new/yum-metadata-parser-1.0.3/PKG-INFO
--- old/yum-metadata-parser-1.0.2/PKG-INFO	2006-07-12 07:39:00.000000000 +0200
+++ new/yum-metadata-parser-1.0.3/PKG-INFO	2007-01-07 21:34:46.000000000 +0100
@@ -1,6 +1,6 @@
 Metadata-Version: 1.0
 Name: yum-metadata-parser
-Version: 1.0.2
+Version: 1.0.3
 Summary: A fast YUM meta-data parser
 Home-page: UNKNOWN
 Author: UNKNOWN
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.2/setup.py new/yum-metadata-parser-1.0.3/setup.py
--- old/yum-metadata-parser-1.0.2/setup.py	2006-07-12 07:14:30.000000000 +0200
+++ new/yum-metadata-parser-1.0.3/setup.py	2007-01-07 21:28:46.000000000 +0100
@@ -23,7 +23,7 @@
                               'sqlitecache.c'])
 
 setup (name = 'yum-metadata-parser',
-       version = '1.0.2',
+       version = '1.0.3',
        description = 'A fast YUM meta-data parser',
 	   py_modules = ['sqlitecachec'],
        ext_modules = [module])
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.2/sqlitecache.c new/yum-metadata-parser-1.0.3/sqlitecache.c
--- old/yum-metadata-parser-1.0.2/sqlitecache.c	2006-06-06 15:36:45.000000000 +0200
+++ new/yum-metadata-parser-1.0.3/sqlitecache.c	2007-01-07 21:28:20.000000000 +0100
@@ -24,9 +24,20 @@
 /* Make room for 2500 package ids, 40 bytes + '\0' each */
 #define PACKAGE_IDS_CHUNK 41 * 2500
 
-typedef void (*ProgressFn) (guint32 current, guint32 total, gpointer user_data);
+typedef struct _UpdateInfo UpdateInfo;
 
-typedef struct {
+typedef void (*InfoInitFn) (UpdateInfo *update_info, sqlite3 *db, GError **err);
+typedef void (*InfoCleanFn) (UpdateInfo *update_info);
+
+typedef void (*XmlParseFn)  (const char *filename,
+                             CountFn count_callback,
+                             PackageFn package_callback,
+                             gpointer user_data,
+                             GError **err);
+
+typedef void (*WriteDbPackageFn) (UpdateInfo *update_info, Package *package);
+
+struct _UpdateInfo {
     sqlite3 *db;
     sqlite3_stmt *remove_handle;
     guint32 count_from_md;
@@ -37,9 +48,16 @@
     GHashTable *all_packages;
     GStringChunk *package_ids_chunk;
     GTimer *timer;
-    ProgressFn progress_cb;
+    gpointer python_callback;
+    
+    InfoInitFn info_init;
+    InfoCleanFn info_clean;
+    CreateTablesFn create_tables;
+    WriteDbPackageFn write_package;
+    XmlParseFn xml_parse;
+
     gpointer user_data;
-} UpdateInfo;
+};
 
 static void
 update_info_init (UpdateInfo *info, GError **err)
@@ -124,6 +142,7 @@
     g_timer_destroy (info->timer);
 }
 
+
 /* Primary */
 
 typedef struct {
@@ -137,8 +156,10 @@
 } PackageWriterInfo;
 
 static void
-package_writer_info_init (PackageWriterInfo *info, sqlite3 *db, GError **err)
+package_writer_info_init (UpdateInfo *update_info, sqlite3 *db, GError **err)
 {
+    PackageWriterInfo *info = (PackageWriterInfo *) update_info;
+
     info->pkg_handle = yum_db_package_prepare (db, err);
     if (*err)
         return;
@@ -196,31 +217,10 @@
 }
 
 static void
-add_package (Package *package, gpointer user_data)
-{
-    UpdateInfo *info = (UpdateInfo *) user_data;
-
-    g_hash_table_insert (info->all_packages,
-                         g_string_chunk_insert (info->package_ids_chunk,
-                                                package->pkgId),
-                         GINT_TO_POINTER (1));
-
-    if (g_hash_table_lookup (info->current_packages,
-                             package->pkgId) == NULL) {
-
-        write_package_to_db (info, package);
-        info->add_count++;
-    }
-
-    if (info->count_from_md > 0 && info->progress_cb)
-        info->progress_cb (++info->packages_seen,
-                           info->count_from_md,
-                           info->user_data);
-}
-
-static void
-package_writer_info_clean (PackageWriterInfo *info)
+package_writer_info_clean (UpdateInfo *update_info)
 {
+    PackageWriterInfo *info = (PackageWriterInfo *) update_info;
+    
     if (info->pkg_handle)
         sqlite3_finalize (info->pkg_handle);
     if (info->requires_handle)
@@ -235,64 +235,6 @@
         sqlite3_finalize (info->files_handle);
 }
 
-static char *
-update_primary (const char *md_filename,
-                const char *checksum,
-                ProgressFn progress_cb,
-                gpointer user_data,
-                GError **err)
-{
-    PackageWriterInfo info;
-    UpdateInfo *update_info = &info.update_info;
-    char *db_filename;
-
-    memset (&info, 0, sizeof (PackageWriterInfo));
-
-    db_filename = yum_db_filename (md_filename);
-    update_info->db = yum_db_open (db_filename, checksum,
-                                   yum_db_create_primary_tables,
-                                   err);
-
-    if (*err != NULL)
-        goto cleanup;
-
-    if (!update_info->db)
-        return db_filename;
-
-    update_info_init (update_info, err);
-    if (*err)
-        goto cleanup;
-
-    update_info->progress_cb = progress_cb;
-    update_info->user_data = user_data;
-    package_writer_info_init (&info, update_info->db, err);
-    if (*err)
-        goto cleanup;
-
-    sqlite3_exec (update_info->db, "BEGIN", NULL, NULL, NULL);
-    yum_xml_parse_primary (md_filename, count_cb, add_package, &info, err);
-    if (*err)
-        goto cleanup;
-    sqlite3_exec (update_info->db, "COMMIT", NULL, NULL, NULL);
-
-    update_info_remove_old_entries (update_info);
-
-    yum_db_dbinfo_update (update_info->db, checksum, err);
-
- cleanup:
-    package_writer_info_clean (&info);
-    update_info_done (update_info, err);
-
-    if (update_info->db)
-        sqlite3_close (update_info->db);
-
-    if (*err) {
-        g_free (db_filename);
-        db_filename = NULL;
-    }
-
-    return db_filename;
-}
 
 /* Filelists */
 
@@ -303,111 +245,104 @@
 } FileListInfo;
 
 static void
-update_filelist_cb (Package *p, gpointer user_data)
+update_filelist_info_init (UpdateInfo *update_info, sqlite3 *db, GError **err)
 {
-    FileListInfo *info = (FileListInfo *) user_data;
-    UpdateInfo *update_info = &info->update_info;
+    FileListInfo *info = (FileListInfo *) update_info;
 
-    g_hash_table_insert (update_info->all_packages,
-                         g_string_chunk_insert (update_info->package_ids_chunk,
-                                                p->pkgId),
-                         GINT_TO_POINTER (1));
+    info->pkg_handle = yum_db_package_ids_prepare (db, err);
+    if (*err)
+        return;
 
-    if (g_hash_table_lookup (update_info->current_packages,
-                             p->pkgId) == NULL) {
+    info->file_handle = yum_db_filelists_prepare (db, err);
+}
 
-        yum_db_package_ids_write (update_info->db, info->pkg_handle, p);
-        yum_db_filelists_write (update_info->db, info->file_handle, p);
-        update_info->add_count++;
-    }
+static void
+update_filelist_info_clean (UpdateInfo *update_info)
+{
+    FileListInfo *info = (FileListInfo *) update_info;
 
-    if (update_info->count_from_md > 0 && update_info->progress_cb)
-        update_info->progress_cb (++update_info->packages_seen,
-                                  update_info->count_from_md,
-                                  update_info->user_data);
+    if (info->pkg_handle)
+        sqlite3_finalize (info->pkg_handle);
+    if (info->file_handle)
+        sqlite3_finalize (info->file_handle);
 }
 
-static char *
-update_filelist (const char *md_filename,
-                 const char *checksum,
-                 ProgressFn progress_cb,
-                 gpointer user_data,
-                 GError **err)
+static void
+write_filelist_package_to_db (UpdateInfo *update_info, Package *package)
 {
-    FileListInfo info;
-    UpdateInfo *update_info = &info.update_info;
-    char *db_filename;
+    FileListInfo *info = (FileListInfo *) update_info;
 
-    memset (&info, 0, sizeof (FileListInfo));
+    yum_db_package_ids_write (update_info->db, info->pkg_handle, package);
+    yum_db_filelists_write (update_info->db, info->file_handle, package);
+}
 
-    db_filename = yum_db_filename (md_filename);
-    update_info->db = yum_db_open (db_filename, checksum,
-                                   yum_db_create_filelist_tables,
-                                   err);
 
-    if (*err)
-        goto cleanup;
+/* Other */
 
-    if (!update_info->db)
-        return db_filename;
+typedef struct {
+    UpdateInfo update_info;
+    sqlite3_stmt *pkg_handle;
+    sqlite3_stmt *changelog_handle;
+} UpdateOtherInfo;
 
-    update_info_init (update_info, err);
-    if (*err)
-        goto cleanup;
-    update_info->progress_cb = progress_cb;
-    update_info->user_data = user_data;
-    info.pkg_handle = yum_db_package_ids_prepare (update_info->db, err);
+static void
+update_other_info_init (UpdateInfo *update_info, sqlite3 *db, GError **err)
+{
+    UpdateOtherInfo *info = (UpdateOtherInfo *) update_info;
+    info->pkg_handle = yum_db_package_ids_prepare (db, err);
     if (*err)
-        goto cleanup;
+        return;
 
-    info.file_handle = yum_db_filelists_prepare (update_info->db, err);
-    if (*err)
-        goto cleanup;
+    info->changelog_handle = yum_db_changelog_prepare (db, err);
+}
 
-    sqlite3_exec (update_info->db, "BEGIN", NULL, NULL, NULL);
-    yum_xml_parse_filelists (md_filename,
-                             count_cb,
-                             update_filelist_cb,
-                             &info,
-                             err);
-    if (*err)
-        goto cleanup;
-    sqlite3_exec (update_info->db, "COMMIT", NULL, NULL, NULL);
+static void
+update_other_info_clean (UpdateInfo *update_info)
+{
+    UpdateOtherInfo *info = (UpdateOtherInfo *) update_info;
 
-    update_info_remove_old_entries (update_info);
-    yum_db_dbinfo_update (update_info->db, checksum, err);
+    if (info->pkg_handle)
+        sqlite3_finalize (info->pkg_handle);
+    if (info->changelog_handle)
+        sqlite3_finalize (info->changelog_handle);
+}
 
- cleanup:
-    update_info_done (update_info, err);
+static void
+write_other_package_to_db (UpdateInfo *update_info, Package *package)
+{
+    UpdateOtherInfo *info = (UpdateOtherInfo *) update_info;
 
-    if (info.pkg_handle)
-        sqlite3_finalize (info.pkg_handle);
-    if (info.file_handle)
-        sqlite3_finalize (info.file_handle);
-    if (update_info->db)
-        sqlite3_close (update_info->db);
+    yum_db_package_ids_write (update_info->db, info->pkg_handle, package);
+    yum_db_changelog_write (update_info->db, info->changelog_handle, package);
+}
 
-    if (*err) {
-        g_free (db_filename);
-        db_filename = NULL;
-    }
 
-    return db_filename;
-}
+/*****************************************************************************/
 
-/* Other */
+static void
+progress_cb (UpdateInfo *update_info)
+{
+    PyObject *progress = (PyObject *) update_info->python_callback;
+    PyObject *repoid = (PyObject *) update_info->user_data;
+    PyObject *args;
+    PyObject *result;
 
-typedef struct {
-    UpdateInfo update_info;
-    sqlite3_stmt *pkg_handle;
-    sqlite3_stmt *changelog_handle;
-} UpdateOtherInfo;
+    Py_INCREF(repoid);
+   
+    args = PyTuple_New (3);
+    PyTuple_SET_ITEM (args, 0, PyInt_FromLong (update_info->packages_seen));
+    PyTuple_SET_ITEM (args, 1, PyInt_FromLong (update_info->count_from_md));
+    PyTuple_SET_ITEM (args, 2, repoid);
+
+    result = PyEval_CallObject (progress, args);
+    Py_DECREF (args);
+    Py_XDECREF (result);
+}
 
 static void
-update_other_cb (Package *p, gpointer user_data)
+update_package_cb (Package *p, gpointer user_data)
 {
-    UpdateOtherInfo *info = (UpdateOtherInfo *) user_data;
-    UpdateInfo *update_info = &info->update_info;
+    UpdateInfo *update_info = (UpdateInfo *) user_data;
 
     g_hash_table_insert (update_info->all_packages,
                          g_string_chunk_insert (update_info->package_ids_chunk,
@@ -416,34 +351,30 @@
 
     if (g_hash_table_lookup (update_info->current_packages,
                              p->pkgId) == NULL) {
-
-        yum_db_package_ids_write (update_info->db, info->pkg_handle, p);
-        yum_db_changelog_write (update_info->db, info->changelog_handle, p);
+        
+        update_info->write_package (update_info, p);
         update_info->add_count++;
     }
 
-    if (update_info->count_from_md > 0 && update_info->progress_cb)
-        update_info->progress_cb (++update_info->packages_seen,
-                                  update_info->count_from_md,
-                                  update_info->user_data);
+    if (update_info->count_from_md > 0 && update_info->python_callback) {
+        update_info->packages_seen++;
+        progress_cb (update_info);
+    }
 }
 
 static char *
-update_other (const char *md_filename,
-              const char *checksum,
-              ProgressFn progress_cb,
-              gpointer user_data,
-              GError **err)
+update_packages (UpdateInfo *update_info,
+                 const char *md_filename,
+                 const char *checksum,
+                 gpointer python_callback,
+                 gpointer user_data,
+                 GError **err)
 {
-    UpdateOtherInfo info;
-    UpdateInfo *update_info = &info.update_info;
     char *db_filename;
 
-    memset (&info, 0, sizeof (UpdateOtherInfo));
-
     db_filename = yum_db_filename (md_filename);
     update_info->db = yum_db_open (db_filename, checksum,
-                                   yum_db_create_other_tables,
+                                   update_info->create_tables,
                                    err);
 
     if (*err)
@@ -455,22 +386,20 @@
     update_info_init (update_info, err);
     if (*err)
         goto cleanup;
-    update_info->progress_cb = progress_cb;
+    
+    update_info->python_callback = python_callback;
     update_info->user_data = user_data;
-    info.pkg_handle = yum_db_package_ids_prepare (update_info->db, err);
-    if (*err)
-        goto cleanup;
 
-    info.changelog_handle = yum_db_changelog_prepare (update_info->db, err);
+    update_info->info_init (update_info, update_info->db, err);
     if (*err)
         goto cleanup;
 
     sqlite3_exec (update_info->db, "BEGIN", NULL, NULL, NULL);
-    yum_xml_parse_other (md_filename,
-                         count_cb,
-                         update_other_cb,
-                         &info,
-                         err);
+    update_info->xml_parse (md_filename,
+                            count_cb,
+                            update_package_cb,
+                            update_info,
+                            err);
     if (*err)
         goto cleanup;
     sqlite3_exec (update_info->db, "COMMIT", NULL, NULL, NULL);
@@ -479,12 +408,9 @@
     yum_db_dbinfo_update (update_info->db, checksum, err);
 
  cleanup:
+    update_info->info_clean (update_info);
     update_info_done (update_info, err);
 
-    if (info.pkg_handle)
-        sqlite3_finalize (info.pkg_handle);
-    if (info.changelog_handle)
-        sqlite3_finalize (info.changelog_handle);
     if (update_info->db)
         sqlite3_close (update_info->db);
 
@@ -503,11 +429,13 @@
                const char **md_filename,
                const char **checksum,
                PyObject **log,
-               PyObject **progress)
+               PyObject **progress,
+               PyObject **repoid)
 {
     PyObject *callback;
 
-    if (!PyArg_ParseTuple (args, "ssO", md_filename, checksum, &callback))
+    if (!PyArg_ParseTuple (args, "ssOO", md_filename, checksum, &callback,
+                           repoid))
         return FALSE;
 
     if (PyObject_HasAttrString (callback, "log")) {
@@ -532,22 +460,6 @@
 }
 
 static void
-progress_cb (guint32 current, guint32 total, gpointer user_data)
-    {
-    PyObject *progress = (PyObject *) user_data;
-    PyObject *args;
-    PyObject *result;
-
-    args = PyTuple_New (2);
-    PyTuple_SET_ITEM (args, 0, PyInt_FromLong (current));
-    PyTuple_SET_ITEM (args, 1, PyInt_FromLong (total));
-
-    result = PyEval_CallObject (progress, args);
-    Py_DECREF (args);
-    Py_XDECREF (result);
-}
-
-static void
 log_cb (const gchar *log_domain,
         GLogLevelFlags log_level,
         const gchar *message,
@@ -558,6 +470,9 @@
     PyObject *args;
     PyObject *result;
 
+    if (!callback)
+        return;
+
     args = PyTuple_New (2);
 
     switch (log_level) {
@@ -584,39 +499,31 @@
     Py_XDECREF (result);
 }
 
-typedef char * (*UpdateFn) (const char *md_filename,
-                            const char *checksum,
-                            ProgressFn progress_fn,
-                            gpointer user_data,
-                            GError **err);
-
 static PyObject *
-py_update (PyObject *self, PyObject *args, UpdateFn update_fn)
+py_update (PyObject *self, PyObject *args, UpdateInfo *update_info)
 {
     const char *md_filename = NULL;
     const char *checksum = NULL;
     PyObject *log = NULL;
     PyObject *progress = NULL;
+    PyObject *repoid = NULL;
     guint log_id = 0;
     char *db_filename;
     PyObject *ret = NULL;
     GError *err = NULL;
 
-    if (!py_parse_args (args, &md_filename, &checksum, &log, &progress))
+    if (!py_parse_args (args, &md_filename, &checksum, &log, &progress,
+                        &repoid))
         return NULL;
 
-    if (log) {
-        GLogLevelFlags level = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_WARNING |
-            G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_DEBUG;
-        log_id = g_log_set_handler (NULL, level, log_cb, log);
-    }
+    GLogLevelFlags level = G_LOG_LEVEL_MESSAGE | G_LOG_LEVEL_WARNING |
+        G_LOG_LEVEL_CRITICAL | G_LOG_LEVEL_DEBUG;
+    log_id = g_log_set_handler (NULL, level, log_cb, log);
 
-    db_filename = update_fn (md_filename, checksum,
-                             progress != NULL ? progress_cb : NULL,
-                             progress, &err);
+    db_filename = update_packages (update_info, md_filename, checksum,
+                                   progress, repoid, &err);
 
-    if (log_id)
-        g_log_remove_handler (NULL, log_id);
+    g_log_remove_handler (NULL, log_id);
 
     if (db_filename) {
         ret = PyString_FromString (db_filename);
@@ -629,23 +536,49 @@
     return ret;
 }
 
-
 static PyObject *
 py_update_primary (PyObject *self, PyObject *args)
 {
-    return py_update (self, args, update_primary);
+    PackageWriterInfo info;
+    memset (&info, 0, sizeof (PackageWriterInfo));
+
+    info.update_info.info_init = package_writer_info_init;
+    info.update_info.info_clean = package_writer_info_clean;
+    info.update_info.create_tables = yum_db_create_primary_tables;
+    info.update_info.write_package = write_package_to_db;
+    info.update_info.xml_parse = yum_xml_parse_primary;
+
+    return py_update (self, args, (UpdateInfo *) &info);
 }
 
 static PyObject *
 py_update_filelist (PyObject *self, PyObject *args)
 {
-    return py_update (self, args, update_filelist);
+    FileListInfo info;
+    memset (&info, 0, sizeof (FileListInfo));
+
+    info.update_info.info_init = update_filelist_info_init;
+    info.update_info.info_clean = update_filelist_info_clean;
+    info.update_info.create_tables = yum_db_create_filelist_tables;
+    info.update_info.write_package = write_filelist_package_to_db;
+    info.update_info.xml_parse = yum_xml_parse_filelists;
+
+    return py_update (self, args, (UpdateInfo *) &info);
 }
 
 static PyObject *
 py_update_other (PyObject *self, PyObject *args)
 {
-    return py_update (self, args, update_other);
+    UpdateOtherInfo info;
+    memset (&info, 0, sizeof (UpdateOtherInfo));
+
+    info.update_info.info_init = update_other_info_init;
+    info.update_info.info_clean = update_other_info_clean;
+    info.update_info.create_tables = yum_db_create_other_tables;
+    info.update_info.write_package = write_other_package_to_db;
+    info.update_info.xml_parse = yum_xml_parse_other;
+
+    return py_update (self, args, (UpdateInfo *) &info);
 }
 
 static PyMethodDef SqliteMethods[] = {
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.2/sqlitecachec.py new/yum-metadata-parser-1.0.3/sqlitecachec.py
--- old/yum-metadata-parser-1.0.2/sqlitecachec.py	2006-06-06 06:00:28.000000000 +0200
+++ new/yum-metadata-parser-1.0.3/sqlitecachec.py	2007-01-07 21:28:20.000000000 +0100
@@ -12,35 +12,45 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 
-import sqlite
+try:
+    import sqlite3 as sqlite
+except ImportError:
+    import sqlite
 import _sqlitecache
 
 class RepodataParserSqlite:
     def __init__(self, storedir, repoid, callback=None):
-		self.callback = callback
+        self.callback = callback
+        self.repoid = repoid
 
     def open_database(self, filename):
         if not filename:
             return None
-        return sqlite.connect(filename)
+        con = sqlite.connect(filename)
+        if sqlite.version_info[0] > 1:
+            con.row_factory = sqlite.Row
+        return con
 
     def getPrimary(self, location, checksum):
         """Load primary.xml.gz from an sqlite cache and update it 
            if required"""
         return self.open_database(_sqlitecache.update_primary(location,
 															  checksum,
-															  self.callback))
+                                                              self.callback,
+                                                              self.repoid))
 
     def getFilelists(self, location, checksum):
         """Load filelist.xml.gz from an sqlite cache and update it if 
            required"""
         return self.open_database(_sqlitecache.update_filelist(location,
 															   checksum,
-															   self.callback))
+                                                               self.callback,
+                                                               self.repoid))
 
     def getOtherdata(self, location, checksum):
         """Load other.xml.gz from an sqlite cache and update it if required"""
         return self.open_database(_sqlitecache.update_other(location,
 															checksum,
-															self.callback))
+                                                            self.callback,
+                                                            self.repoid))
     
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yum-metadata-parser-1.0.2/yum-metadata-parser.spec new/yum-metadata-parser-1.0.3/yum-metadata-parser.spec
--- old/yum-metadata-parser-1.0.2/yum-metadata-parser.spec	2006-07-12 07:15:10.000000000 +0200
+++ new/yum-metadata-parser-1.0.3/yum-metadata-parser.spec	2007-01-07 21:29:09.000000000 +0100
@@ -2,7 +2,7 @@
 
 Summary: A fast metadata parser for yum
 Name: yum-metadata-parser
-Version: 1.0.2
+Version: 1.0.3
 Release: 1%{?dist}
 Source0: %{name}-%{version}.tar.gz
 License: GPL
@@ -40,6 +40,9 @@
 %{python_sitelib_platform}/sqlitecachec.pyo
 
 %changelog
+* Sun Jan  7 2007 Seth Vidal <skvidal at linux.duke.edu>
+- 1.0.3
+
 * Wed Jul 12 2006 Seth Vidal <skvidal at linux.duke.edu>
 - 1.0.2
 


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org

    

commit yum-metadata-parser

root＠Hilbert.suse.de