SVN: packages.php/plough.php

[vip]

Author: vip
Date: Sat Dec 29 23:09:02 2007
New Revision: 9168

Modified:
   packages.php/plough.php
Log:
- module_id from database, kill redundant functions


Modified: packages.php/plough.php
==============================================================================
--- packages.php/plough.php	(original)
+++ packages.php/plough.php	Sat Dec 29 23:09:02 2007
@@ -16,56 +16,14 @@
 
 	$sources = array();
 
-	$result = $mysqli->query("SELECT `module_id`, `url` FROM `module`");
+	$result = $mysqli->query("SELECT * FROM `module_view`");
 	while($field = $result->fetch_assoc())
 	{
-		$sources[$field['module_id']] = $field['url'];
+		$sources[] = $field;
 	}
 	return $sources;
 }
 
-function find_package_id($name, $module, $epoch, $version, $release)
-{
-	global $mysqli;
-
-	$result = $mysqli->query("SELECT `package_id` FROM `package` WHERE `name`='$name' AND `module_id`='$module' AND `epoch`='$epoch' AND `version`='$version' AND `release`='$release'") or die(mysql_error());
-
-	$id = false;
-
-	if($result->num_rows === 1)
-	{
-		$id = $result->fetch_row();
-		$id = $id[0];
-	}
-	return $id;
-}
-
-function find_module_id($dist, $arch, $name)
-{
-	global $mysqli;
-
-	$result = $mysqli->query("SELECT `module_id` FROM `module` WHERE `name`='$name' AND `arch_id`='$arch' AND `dist_id`='$dist'") or die(mysql_error());
-
-	$id = false;
-
-	if($result->num_rows === 1)
-	{
-		$id = $result->fetch_row();
-		$id = $id[0];
-	}
-	return $id;
-}
-
-function find_dist_id($name)
-{
-	return 1;
-}
-
-function find_arch_id($name)
-{
-	return 1;
-}
-
 function clean_database()
 {
 	global $mysqli;
@@ -73,15 +31,11 @@
 	$mysqli->query("TRUNCATE package");
 }
 
-function parse_primary()
+function parse_primary($module)
 {
 	global $mysqli;
 
-	$dir = "ready"; // TODO: gather from ftp dir
-	$dist = "th";
-	$arch = "i686";
-
-	$module = find_module_id(find_dist_id($dist), find_arch_id($arch), $dir);
+// 	$module = find_module_id(find_dist_id($dist), find_arch_id($arch), $dir);
 
 	$metadata = simplexml_load_file("primary.xml");
 
@@ -178,14 +132,12 @@
 echo "[*] cleaning...\n";
 
 clean_database();
-// die();
-foreach($sources as $module_id => $url)
+die();
+foreach($sources as $s)
 {
-// 	echo "[*] th, ready, i686\n";
-	echo "[*] $module_id ($url)\n";
-
+	echo "[*] {$s['dist']}-{$s['name']}, {$s['arch']}; Id: {$s['module_id']} ({$s['url']})\n";
 	echo "   [+] primary\n";
-	parse_primary();
+	parse_primary($s['module_id']);
 
 	echo "   [+] filelists\n";
 	parse_filelists();