portdb: use configuration order for collections

3 files changed, 20 insertions, 17 deletions

diff --git a/portdb/cacher/init.sql b/portdb/cacher/init.sql
index 7c69ed6..c80606b 100644
--- a/portdb/cacher/init.sql
+++ b/portdb/cacher/init.sql
@@ -5,7 +5,8 @@ create table ports (
 );
 
 create table collections (
-    collname varchar primary key,
+    collid integer primary key,
+    collname varchar,
     maintainer varchar,
     colltype varchar,
     url varchar
diff --git a/portdb/cacher/pdbcacher.php b/portdb/cacher/pdbcacher.php
index 48db41c..2be259e 100755
--- a/portdb/cacher/pdbcacher.php
+++ b/portdb/cacher/pdbcacher.php
@@ -23,13 +23,10 @@ $collections = array (
 	"buddy|percent20@gmail.com|httpup|http://www.buddylindsey.com/crux/ports/",
 	"ca|ca256@gmx.net|httpup|http://egge.portland.co.uk/crux/ca/",
 	"chw|chw@tks6.net|httpup|http://chw.tks6.net/crux_ports/",
-	"cpwi|ulughbegh@bluebottle.com|httpup|http://www.scmerkezi.org/crux/ports/",
 	"crux.spb.ru|tzong@crux.spb.ru|httpup|http://crux.spb.ru/ports/",
 	"dahl|dahl@c64.org|httpup|http://dahl.varnamo.nu/httpup/",
 	"danieldk|danieldk@pobox.com|httpup|http://danieldk.org/ports/",
-	"danm|daniel@danm.de|httpup|http://www.danm.de/ports/",
 	"dektria|dektria@users.sourceforge.net|httpup|http://dektria.org.ua/CRUX/ports/",
-	"diederick|diederick76@gmail.com|httpup|http://www.diederickdevries.net/~diederick/repo/",
 	"ea|crux@eckigesauge.de|httpup|http://www.eckigesauge.de/crux/ports/",
 	"falcon|raider@behid.net|httpup|http://crux.thunder.homeunix.org/ports/",
 	"gnome|jaeger@morpheus.net|httpup|http://jaeger.morpheus.net/linux/crux/repos/gnome/",
@@ -40,31 +37,24 @@ $collections = array (
 	"j2|jjasghar@gmail.com|httpup|http://tito.homelinux.org/repo/",
 	"jaeger|jaeger@morpheus.net|httpup|http://jaeger.morpheus.net/linux/crux/repo/",
 	"jdolan|jasonthomasdolan@yahoo.com|httpup|http://jdolan.dyndns.org/jaydolan/ports/",
-	"jolupa|jolupa@ya.com|httpup|http://www.jolupatech.info/crux/",
 	"jue|jue@jue.li|httpup|http://jue.li/crux/ports/",
 	"jw|jw@smts.ch|httpup|http://jw.smts.ch/files/crux/ports/",
 	"larryn|wawrzek@gmail.com|httpup|http://wawrzek.name/Crux/Ports/",
 	"lithium|lithium@poolofrandomness.com|httpup|http://www.poolofrandomness.com/crux/",
-	"loophole|loophole@morpheus.net|httpup|http://loophole.morpheus.net/linux/ports/",
 	"malster|clover@mail.nnov.ru|httpup|http://malster.nnov.ru/ports/",
 	"mark|mark@borkware.net|httpup|http://borkware.net/crux/ports/",
 	"mhedenskog|mattias@hedenskog.se|httpup|http://magog.se/crux/",
 	"mike|mike@openbunker.org|httpup|http://openbunker.org/crux/ports/mike/",
-	"monad|arbor@mail.ru|httpup|http://monad.ru/ports/",
 	"mono|nymacro@gmail.com|httpup|http://members.optusnet.com.au/dfmarks/crux/mono/",
 	"niklas|niklas@ulug.org|httpup|http://www.drummel.net/crux/",
 	"ninuzzo|ant@venus.deis.unical.it|httpup|http://monitor.deis.unical.it/ant/crux/",
-	"noneus|noneus@noneus.de|httpup|http://noneus.de/crux-ports/",
 	"nthuynh|nthuynh@fastmail.fm|httpup|http://nthuynh.yazzy.org/crux/httpup/",
 	"nym|nymacro@gmail.com|httpup|http://members.optushome.com.au/dfmarks/crux/ports/",
 	"obbl|mo@obbl-net.de|httpup|http://obbl.homeunix.org/~crux/ports/",
 	"ogg|ogg@linux.se|httpup|http://ogg.kicks-ass.net/crux/ports/",
-	"pazo|off_pazo@shiba.dk|httpup|http://shiba.dk/pazo/ports/",
 	"per-olov|teozal@chem.uni.torun.pl|httpup|http://sapho.chem.uni.torun.pl/~teozal/crux/ports/per-olov/",
-	"phire|michael.auchter@gmail.com|httpup|http://ports.phire.org/",
 	"predatorfreak|predatorfreak@dcaf-security.org|httpup|http://www.dcaf-security.org/ports/",
 	"prologic|prologic@shortcircuit.net.au|httpup|http://crux.shortcircuit.net.au/ports/",
-	"radix|luke.hoersten@gmail.com|httpup|http://www.theradixpoint.com/crux/ports/",
 	"rehabdoll|fredrik@obra.se|httpup|http://fredrik.obra.se/crux/ports/",
 	"rho|rho@thinkingspot.ch|httpup|http://www.thinkingspot.ch/crux/ports/",
 	"rk|crux@roeschu.ch|httpup|http://www.roeschu.ch/ports/crux/",
@@ -76,19 +66,15 @@ $collections = array (
 	"singular|arbor@mail.ru|httpup|http://singular.ru/ports/",
 	"ssimon|swsimon@gmail.com|httpup|http://lumina.ig3.net/linux/crux/ports/",
 	"steini|steini@kieselsteini.de|httpup|http://kieselsteini.de/dateien/ports/",
-	"sten|nick.steeves@shaw.ca|httpup|http://members.shaw.ca/nick.steeves/ports/",
 	"strw|strawi@googlemail.com|httpup|http://www.gnoedi.org/~straw/crux/ports/",
-	"stsp|stsp@binarchy.net|httpup|http://guerila.com/stsp/crux/ports/",
 	"syslinx|phil@syslinx.org|httpup|http://www.syslinx.org/crux/ports/",
 	"thenschel|thenschel@henschelsoft.de|httpup|http://www.henschelsoft.de/cruxports/",
 	"thomas|t.mausbach@netcologne.de|httpup|http://www.mausbach.mynetcologne.de/crux/httpup/thomas/",
 	"tilman|tilman@code-monkey.de|rsync|code-monkey.de::crux-ports/",
 	"uhlu|crux@uhlu.com|httpup|http://ports.uhlu.com/repository/",
 	"uibds|Schick.Johannes@gmail.com|httpup|http://www.stud.uni-karlsruhe.de/~uibds/ports/",
-	"ukraine|artur@idt.org.ua|httpup|http://crux.org.ua/repo/ukraine",
 	"vico|vico@bicisport.de|httpup|http://vico.kleinplanet.de/files/repo/",
 	"viper|viper@hometux.de|httpup|http://hometux.de/crux/ports/",
-	"wimpress|crux@flexion.plus.com|httpup|http://www.flexion.plus.com/stable/",
 	"x11r7|tilman@code-monkey.de|rsync|code-monkey.de::crux-ports-x11r7",
 	"yazicivo|v0lkany@yahoo.com|httpup|http://yazicivo.fateback.com/ports/",
 	"yhafri|ycrux@club-internet.fr|httpup|http://perso.club-internet.fr/yhafri/crux/",
@@ -97,6 +83,22 @@ $collections = array (
 	"zh_embed|zh@despammed.com|httpup|http://zh.yazzy.org/crux/httpup/embed/",
 );
 
+# inactive or unavailable repositories
+#	"cpwi|ulughbegh@bluebottle.com|httpup|http://www.scmerkezi.org/crux/ports/",
+#	"danm|daniel@danm.de|httpup|http://www.danm.de/ports/",
+#	"diederick|diederick76@gmail.com|httpup|http://www.diederickdevries.net/~diederick/repo/",
+#	"jolupa|jolupa@ya.com|httpup|http://www.jolupatech.info/crux/",
+#	"loophole|loophole@morpheus.net|httpup|http://loophole.morpheus.net/linux/ports/",
+#	"monad|arbor@mail.ru|httpup|http://monad.ru/ports/",
+#	"noneus|noneus@noneus.de|httpup|http://noneus.de/crux-ports/",
+#	"pazo|off_pazo@shiba.dk|httpup|http://shiba.dk/pazo/ports/",
+#	"phire|michael.auchter@gmail.com|httpup|http://ports.phire.org/",
+#	"radix|luke.hoersten@gmail.com|httpup|http://www.theradixpoint.com/crux/ports/",
+#	"sten|nick.steeves@shaw.ca|httpup|http://members.shaw.ca/nick.steeves/ports/",
+#	"stsp|stsp@binarchy.net|httpup|http://guerila.com/stsp/crux/ports/",
+#	"ukraine|artur@idt.org.ua|httpup|http://crux.org.ua/repo/ukraine",
+#	"wimpress|crux@flexion.plus.com|httpup|http://www.flexion.plus.com/stable/",
+
 $dsn = 'sqlite:////home/crux/public_html/local/portdb.db';
 
 # End of configuration ######################################################
@@ -189,7 +191,7 @@ function storeCollection($coll, $ports) {
 	if (DB::isError($res)) die("Query error (port)");
     }
     $vals = explode('|', $coll);
-    $sth = $db->prepare("insert into collections values (?, ?, ?, ?)");
+    $sth = $db->prepare("insert into collections values (NULL, ?, ?, ?, ?)");
     $res = $db->execute($sth, $vals);
     if (DB::isError($res)) die("Query error (collection)");
 }
diff --git a/portdb/portdb/index.php b/portdb/portdb/index.php
index e25ac26..99289f2 100755
--- a/portdb/portdb/index.php
+++ b/portdb/portdb/index.php
@@ -52,7 +52,7 @@ function showCollections() {
     global $db;
     $sql = "select collname,maintainer,colltype,url,count(*) as tot from collections
         join ports on collection=collname
-        group by collname order by collname";
+        group by collname order by collections.collid";
     $res =& $db->Query($sql);
     if (DB::isError($res)) die("Query error");
     echo "<h2>Overview of available repositories</h2>\n";