Package | Summary | Distribution | Download |
Package | Summary | Distribution | Download |
---|
"; + echo "\t | \n"; } else { $rpmsubdir = substr($rpmsubdir, 0, $pos); - $url = "/linux/RPM/$subdir/$rpmsubdir/$name-$version-$release.$arch.html"; + $url = "$subdir/$rpmsubdir/$name-$version-$release.$arch.html"; $url = str_replace('///', '/', $url); $url = str_replace('//', '/', $url); - echo " | $name-$version-$release.$arch.html | "; + echo "\t$name-$version-$release.$arch.html | \n"; } } else { - echo ""; + echo "\t | \n"; } - echo " | $summary | "; - echo "$dist | "; + echo "\t$summary | \n"; + echo "\t$dist | \n"; $url = strstr($path, '/linux'); if (!$url) $url = strstr($path, '/pub'); @@ -354,15 +409,15 @@ $url = str_replace('///', '/', $url); $url = str_replace('//', '/', $url); if ($host == "rpmfind.net") { - echo "$name-$version-$release.$arch.rpm | "; + echo "\t$name-$version-$release.$arch.rpm | \n"; } else if ($host == "www.rpmfind.net") { - echo "$name-$version-$release.$arch.rpm | "; + echo "\t$name-$version-$release.$arch.rpm | \n"; } else { - echo "$name-$version-$release.$arch.rpm | "; + echo "\t$name-$version-$release.$arch.rpm | \n"; } } else - echo "$name-$version-$release.$arch.rpm | "; - echo "$name-$version-$release.$arch.rpm | \n"; + echo "\n"; } printf("
Generated by rpm2html 1.6 +
Generated by rpm2html 1.8.1
Daniel Veillard diff -Nur rpm2html-1.8.1/sql.c rpm2html-1.8.1.new/sql.c --- rpm2html-1.8.1/sql.c 2002-02-17 02:34:35 +0300 +++ rpm2html-1.8.1.new/sql.c 2003-09-17 08:49:25 +0400 @@ -80,6 +80,8 @@ base = "rpmfind"; if (passwd == NULL) passwd = getenv("MySQL_PASS"); + if (passwd == NULL) + passwd = ""; if (user == NULL) user = getenv("MySQL_USER"); if (user == NULL) @@ -833,8 +835,8 @@ URLSrc varchar(255), \n\ Html varchar(8), \n\ Color varchar(10), \n\ - Key1 text, \n\ - Key2 text, \n\ + FollowSymLinks text, \n\ + RpmSymLinks text, \n\ Description text, \n\ PRIMARY KEY (ID), \n\ KEY Name (Name(10)) \n\ @@ -1232,7 +1234,7 @@ char query[MAX_QUERY]; int left = MAX_QUERY - 1; int len; - char *end; +// char *end; static int queries = 0; if (filename == NULL) @@ -1290,13 +1292,13 @@ } int sql_get_top_queries(int count) { - int id; +// int id; MYSQL_RES *result; MYSQL_ROW row; char query[MAX_QUERY]; int left = MAX_QUERY - 1; int len; - char *end; +// char *end; static int queries = 0; if (count <= 0) @@ -2750,7 +2752,7 @@ for (i = 0;i < index;i++) { snprintf(query, SMALL_QUERY - 1, - "SELECT Directory,Name,Vendor,Path,URL,URLSrc,Description,Html,Color \ + "SELECT Directory,Name,Vendor,Path,URL,URLSrc,Description,Html,Color,FollowSymLinks,RpmSymLinks \ FROM Distribs WHERE ID=%d", ids[i]); query[SMALL_QUERY - 1] = 0; if (mysql_query(sql,query)) { @@ -2778,6 +2780,10 @@ printf("html=%s\n", row[7]); if (row[8] != NULL) printf("color=%s\n", row[8]); + if (row[9] != NULL) + printf("followsymlinks=%s\n", row[9]); + if (row[10] != NULL) + printf("rpmsymlinks=%s\n", row[10]); } } mysql_free_result(result); @@ -3320,7 +3326,7 @@ if (!strcasecmp(name, "mirror")) { sql_add_metadata_base(value); } else { - printf("Config file : %s entry for [metadata] ignored\n", name); + printf("Config SQL : %s entry for [metadata] ignored\n", name); } return; } @@ -3373,6 +3379,20 @@ else fprintf(stderr, "database has no distrib: %s", rpmdir); + } else if (!strcasecmp(name, "followsymlinks")) { + distrib = sql_read_info_key("Distribs", "Directory", rpmdir); + if (distrib > 0) + sql_update_id("Distribs", distrib, "FollowSymLinks", value); + else + fprintf(stderr, "database has no distrib: %s", + rpmdir); + } else if (!strcasecmp(name, "rpmsymlinks")) { + distrib = sql_read_info_key("Distribs", "Directory", rpmdir); + if (distrib > 0) + sql_update_id("Distribs", distrib, "RpmSymLinks", value); + else + fprintf(stderr, "database has no distrib: %s", + rpmdir); } else if (!strcasecmp(name, "mirror")) { distrib = sql_read_info_key("Distribs", "Directory", rpmdir); if (distrib > 0) @@ -3381,7 +3401,7 @@ fprintf(stderr, "database has no distrib: %s", rpmdir); } else { - printf("Config file : %s entry for [%s] ignored\n", name, rpmdir); + printf("Config SQL : %s entry for [%s] ignored\n", name, rpmdir); } }