merge

tools/_infotojson/infotojson.c

@@ -94,20 +94,23 @@ static int storejsontodb(const struct json *jsonobj, const char *db)
 	struct db_query *q;
 	
 	handle = db_open(db);
-	query = talloc_asprintf(NULL, "SELECT module from search where module=\"%s\";", jsonobj->module);
+	query = talloc_asprintf(NULL, "SELECT module, author from search where module=\"%s\";", jsonobj->module);
 	q = db_query(handle, query);
 	
 	desc = strjoin(NULL, jsonobj->desc,"\n");
 	strreplace(desc, '\'', ' ');
 
 	depends = strjoin(NULL, jsonobj->depends,"\n");
-	if (!q->num_rows)
+	if (q->num_rows && streq(jsonobj->author, q->rows[0][1]))		
+		cmd = talloc_asprintf(NULL, "UPDATE search set author=\"%s\", title=\"%s\", desc=\'%s\' depends=\'%s\' where module=\"%s\";",
+			jsonobj->author, jsonobj->title, desc, depends, jsonobj->module);
+	else if (!q->num_rows)
 		cmd = talloc_asprintf(NULL, "INSERT INTO search VALUES(\"%s\",\"%s\",\"%s\", \'%s\', \'%s\', 0);",
 			jsonobj->module, jsonobj->author, jsonobj->title, depends, desc);
 	else
-		cmd = talloc_asprintf(NULL, "UPDATE search set author=\"%s\", title=\"%s\", desc=\'%s\' depends=\'%s\' where module=\"%s\";",
-			jsonobj->author, jsonobj->title, desc, depends, jsonobj->module);
-
+		cmd = talloc_asprintf(NULL, "INSERT INTO search VALUES(\"%s-%s\",\"%s\",\"%s\", \'%s\', \'%s\', 0);",
+			jsonobj->module, jsonobj->author, jsonobj->author, jsonobj->title, depends, desc);
+		
 	db_command(handle, cmd);	
 	db_close(handle);
 	talloc_free(depends);

web/dispmoduleinfo.php

@@ -13,12 +13,12 @@ $row = sqlite3_fetch_array($result);
 <tr align="center" bgcolor="FFFFCC">
 <td width="50%">
 	<?php 
-		if(file_exists($tar_dir . $_GET['module']."_dependencies.tar"))
+		if(file_exists($tar_dir . $_GET['module'].".tar"))
 			echo '<a href='. $tar_dir . $_GET['module'] . '.tar>Download</a>';
 	?>
 <td>
 	<?php 
-		if(file_exists($tar_dir . $_GET['module']."_dependencies.tar"))
+		if(file_exists($tar_dir . $_GET['module']."_with_deps.tar"))
 			echo '<a href='. $tar_dir . $_GET['module'] . '_with_deps.tar>Download Dependencies</a>';
 	?>
 </td>

web/search.html

@@ -24,4 +24,15 @@
 		<td align="left"><a href=search.php?disp=all>Display all</a></td>
 		</tr>
 		</table>
+		<table align="center">
+ 				<tr align="left">
+ 				<?php
+ 					for ($i = "a"; $i != "aa"; $i++) {
+ 						echo '<td><a href=search.php?disp='. $i . '>'. $i .'</a></td>';
+ 					}
+ 				?>
+				</tr> 					
+ 			</td>
+ 		</tr>
+		</table>
 		</form>

web/search.php

@@ -12,16 +12,22 @@ if(isset($_POST['search'])) {
 	if(trim($searchtext) == '') { 
 		echo '<div align="center"><font color="RED">Please enter some keyword to search</font></div>';
 		exit();
-	}
+	} 
+	$searchtext = '%'.$searchtext.'%';
 }
 else if($_GET['author'] != '') {
-	$searchtext = $_GET['author'];
+	$searchtext = '%'.$_GET['author'].'%';
 	$in = "author";
 }	
 else if ($_GET['disp'] == 'all') {
-	$searchtext = "";
+	$searchtext = "%";
+	$in = "module";
+}
+else if ($_GET['disp'] != '') {
+	$searchtext = $_GET['disp'].'%';
 	$in = "module";
 }	
+	
 else 
 	exit();
 	
@@ -29,12 +35,14 @@ $result = searchdb($searchtext, $in, $db);
 echo '<table align="left" border="0" cellpadding="8" cellspacing="1">';
 if($row = sqlite3_fetch_array($result)) 
 	echo "<tr><td><a href=\"dispmoduleinfo.php?module=".$row['module']."\">".$row["module"]."</a></br>".
-		 "<a href=\"search.php?author=".$row["author"]."\">".$row["author"]."</a> : ". $row["title"]." </br> </br></td></tr>";
+		 		"<a href=\"search.php?author=".$row["author"]."\">".$row["author"]."</a> : ". $row["title"].
+		 			" </br> </br></td></tr>";
 else
 	echo '<div align="center"><font color="RED"> No results found</font></div>';
 while($row = sqlite3_fetch_array($result)) {	
 	echo "<tr><td><a href=\"dispmoduleinfo.php?module=".$row['module']."\">".$row["module"]."</a></br>".
-		 "<a href=\"search.php?author=".$row["author"]."\">".$row["author"]."</a> : ". $row["title"]." </br> </br></td></tr>";
+		 		"<a href=\"search.php?author=".$row["author"]."\">".$row["author"]."</a> : ". $row["title"].
+		 			" </br> </br></td></tr>";
 }
 echo '</table>';
 ?>

web/searchengine.php

@@ -4,11 +4,14 @@ function searchdb($text, $in, $db)
 	//search db 
 	$handle = sqlite3_open($db) or die("Could not open database");
 	if($in == 'module')
-		$query = "select * from search where title LIKE \"%$text%\"";
+		$query = "select * from search where title LIKE \"$text\" order by module,
+						author";
 	else if($in == 'author')
-		$query = "select * from search where author LIKE \"%$text%\"";
+		$query = "select * from search where author LIKE \"$text\" order by module, 
+						author";
 	else 	
-		$query = "select * from search where title LIKE \"%$text%\" or author LIKE \"%$text%\"";
+		$query = "select * from search where title LIKE \"$text\" or author LIKE \"$text\" 
+						order by module, author";
 		
 	$result = sqlite3_query($handle, $query) or die("Error in query: ".sqlite3_error($handle));
 	return $result;