Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 3051996579914ca156f544d488699b2c > files > 5

rpm2html-1.11.0-1mdv2010.1.src.rpm

diff -uw rpm2html-1.9.2/sql.c rpm2html-1.9.2.patched/sql.c
--- rpm2html-1.9.2/sql.c	2005-08-19 06:15:54.000000000 +0900
+++ rpm2html-1.9.2.patched/sql.c	2005-11-11 14:37:38.000000000 +0900
@@ -855,7 +855,7 @@
 filename varchar(255) NOT NULL, \n\
 Name varchar(50) NOT NULL, \n\
 Version varchar(50) NOT NULL, \n\
-Release varchar(50) NOT NULL, \n\
+Rel varchar(50) NOT NULL, \n\
 Arch varchar(15) NOT NULL, \n\
 Dist int(11), \n\
 URL varchar(255), \n\
@@ -1381,7 +1381,7 @@
     if (Version != NULL)
 	nb_fields += sql_update_id("Packages", id, "Version", Version);
     if (Release != NULL)
-	nb_fields += sql_update_id("Packages", id, "Release", Release);
+	nb_fields += sql_update_id("Packages", id, "Rel", Release);
     if (Release != NULL)
 	nb_fields += sql_update_id("Packages", id, "Arch", Arch);
     if (Category != NULL)
@@ -2211,7 +2211,7 @@
     if (rpm2htmlVerbose)
 	printf("sqlRpmByDate query\n");
 
-    query = "select ID,Name,Version,Release,Arch,Date,Summary,filename,Dist,Category,Os,Packager,Vendor from Packages where Date IS NOT NULL  and Date < UNIX_TIMESTAMP() + 300000 order by Date desc limit 1000";
+    query = "select ID,Name,Version,Rel,Arch,Date,Summary,filename,Dist,Category,Os,Packager,Vendor from Packages where Date IS NOT NULL  and Date < UNIX_TIMESTAMP() + 300000 order by Date desc limit 1000";
 
     /*
      * Search first for the ID if it already exists
@@ -2268,7 +2268,7 @@
     if (rpm2htmlVerbose)
 	printf("sqlRpmAll query\n");
 
-    query = "select ID,Name,Version,Release,Arch,Date,Summary,filename,Dist,Category,Os,Packager,Vendor from Packages";
+    query = "select ID,Name,Version,Rel,Arch,Date,Summary,filename,Dist,Category,Os,Packager,Vendor from Packages";
 
     /*
      * Search first for the ID if it already exists
@@ -2413,7 +2413,7 @@
      * Query the database for the informations providing the resource.
      */
     snprintf(query, SMALL_QUERY,
-       "select filename,Dist,Name,Version,Release,Arch,Summary from Packages");
+       "select filename,Dist,Name,Version,Rel,Arch,Summary from Packages");
     query[SMALL_QUERY - 1] = 0;
     if (mysql_query(sql, query)) {
 	printf("sql_dump_rdf_full_index: SELECT from Packages failed: %s\n",
@@ -2545,7 +2545,7 @@
      * Query the database for the informations providing the resource.
      */
     snprintf(query, MAX_QUERY,
-"select Packages.filename,Packages.Dist,Packages.Name,Packages.Version,Packages.Release,Packages.Arch,Packages.Os,Packages.Packager,Packages.Date,Packages.Size,Packages.Vendor from Packages,Provides where Provides.Resource=\"%s\" and Provides.ID = Packages.ID",
+"select Packages.filename,Packages.Dist,Packages.Name,Packages.Version,Packages.Rel,Packages.Arch,Packages.Os,Packages.Packager,Packages.Date,Packages.Size,Packages.Vendor from Packages,Provides where Provides.Resource=\"%s\" and Provides.ID = Packages.ID",
              resource);
     query[MAX_QUERY - 1] = 0;
     if (mysql_query(sql, query)) {