[31456] trunk/www
jmpp at macports.org
jmpp at macports.org
Sat Nov 24 10:43:10 PST 2007
Revision: 31456
http://trac.macosforge.org/projects/macports/changeset/31456
Author: jmpp at macports.org
Date: 2007-11-24 10:43:09 -0800 (Sat, 24 Nov 2007)
Log Message:
-----------
Standardize db variables naming with those found on the base/portmgr/jobs/PortIndex2MySQL script.
Modified Paths:
--------------
trunk/www/includes/common.inc
trunk/www/ports.php
Modified: trunk/www/includes/common.inc
===================================================================
--- trunk/www/includes/common.inc 2007-11-24 18:39:52 UTC (rev 31455)
+++ trunk/www/includes/common.inc 2007-11-24 18:43:09 UTC (rev 31456)
@@ -9,8 +9,8 @@
#####################################################################
# Ports database connection parameters:
-$portsdb = 'macports';
$portsdb_host = 'localhost';
+$portsdb_name = 'macports';
$portsdb_user = 'www';
$portsdb_passwd = '';
$portsdb_connect = mysql_pconnect($portsdb_host, $portsdb_user, $portsdb_passwd) or die("Can't connect to the MacPorts database!");
@@ -87,9 +87,9 @@
# Total count of currently available ports:
function ports_count() {
- global $portsdb;
+ global $portsdb_name;
- $result = mysql_query("SELECT count(name) FROM $portsdb.portfiles") or die("Error: " . mysql_error());
+ $result = mysql_query("SELECT count(name) FROM $portsdb_name.portfiles") or die("Error: " . mysql_error());
if ($result) {
$row = mysql_fetch_array($result);
$count = $row[0];
@@ -104,9 +104,9 @@
# Total count of port categories:
function categories_count() {
- global $portsdb;
+ global $portsdb_name;
- $result = mysql_query("SELECT COUNT(DISTINCT category) FROM $portsdb.categories") or die ("Error: " . mysql_error());
+ $result = mysql_query("SELECT COUNT(DISTINCT category) FROM $portsdb_name.categories") or die ("Error: " . mysql_error());
if ($result) {
$row = mysql_fetch_array($result);
$count = $row[0];
Modified: trunk/www/ports.php
===================================================================
--- trunk/www/ports.php 2007-11-24 18:39:52 UTC (rev 31455)
+++ trunk/www/ports.php 2007-11-24 18:43:09 UTC (rev 31456)
@@ -21,7 +21,7 @@
This form allows you to search the current index of MacPorts software. <br />
<i>Index last updated: </i>
<?php
- $sql = "SELECT UNIX_TIMESTAMP(activity_time) FROM $portsdb.log ORDER BY UNIX_TIMESTAMP(activity_time) DESC";
+ $sql = "SELECT UNIX_TIMESTAMP(activity_time) FROM $portsdb_name.log ORDER BY UNIX_TIMESTAMP(activity_time) DESC";
$result = mysql_query($sql);
if ($result && $row = mysql_fetch_row($result)) {
echo date("d-M-Y H:i:s", $row[0]);
@@ -54,7 +54,7 @@
<tr><td colspan="4"><hr /></td></tr>
<tr><th colspan="4" align="left">View By Category:</th></tr>
<?php
- $query = "SELECT DISTINCT category FROM $portsdb.categories ORDER BY category";
+ $query = "SELECT DISTINCT category FROM $portsdb_name.categories ORDER BY category";
$result = mysql_query($query);
if ($result) {
while ($row = mysql_fetch_assoc($result)) {
@@ -72,7 +72,7 @@
if ($by && ($substr || $by == "all")) {
$fields = "name, path, version, description";
$query = "1";
- $tables = "$portsdb.portfiles p";
+ $tables = "$portsdb_name.portfiles p";
if ($by == "name") {
$query .= " AND p.name LIKE '%" . mysql_real_escape_string($substr) . "%'";
}
@@ -83,19 +83,19 @@
$query .= " AND p.description LIKE '%" . mysql_real_escape_string($substr) . "%'";
}
if ($by == "cat") {
- $tables .= ", $portsdb.categories c";
+ $tables .= ", $portsdb_name.categories c";
$query .= " AND c.portfile=p.name AND c.category='" . mysql_real_escape_string($substr) . "'";
}
if ($by == "variant") {
- $tables .= ", $portsdb.variants v";
+ $tables .= ", $portsdb_name.variants v";
$query .= " AND v.portfile=p.name AND v.variant='" . mysql_real_escape_string($substr) . "'";
}
if ($by == "platform") {
- $tables .= ", $portsdb.platforms pl";
+ $tables .= ", $portsdb_name.platforms pl";
$query .= " AND pl.portfile=p.name AND pl.platform ='" . mysql_real_escape_string($substr) . "'";
}
if ($by == "maintainer") {
- $tables .= ", $portsdb.maintainers m";
+ $tables .= ", $portsdb_name.maintainers m";
$query .= " AND m.portfile=p.name AND m.maintainer LIKE '%" . mysql_real_escape_string($substr) . "%'";
}
$query = "SELECT DISTINCT $fields FROM $tables WHERE $query ORDER BY name";
@@ -114,7 +114,7 @@
<?php echo htmlspecialchars($row['description']); ?><br />
<?php
/* MAINTAINERS */
- $nquery = "SELECT maintainer FROM $portsdb.maintainers WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, maintainer";
+ $nquery = "SELECT maintainer FROM $portsdb_name.maintainers WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, maintainer";
$nresult = mysql_query($nquery);
if ($nresult) {
?>
@@ -132,7 +132,7 @@
}
/* CATEGORIES */
- $nquery = "SELECT category FROM $portsdb.categories WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, category";
+ $nquery = "SELECT category FROM $portsdb_name.categories WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY is_primary DESC, category";
$nresult = mysql_query($nquery);
if ($nresult) {
?>
@@ -151,7 +151,7 @@
}
/* PLATFORMS */
- $nquery = "SELECT platform FROM $portsdb.platforms WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY platform";
+ $nquery = "SELECT platform FROM $portsdb_name.platforms WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY platform";
$nresult = mysql_query($nquery);
if ($nresult && mysql_num_rows($nresult) > 0) {
?>
@@ -167,7 +167,7 @@
}
/* DEPENDENCIES */
- $nquery = "SELECT library FROM $portsdb.dependencies WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY library";
+ $nquery = "SELECT library FROM $portsdb_name.dependencies WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY library";
$nresult = mysql_query($nquery);
if ($nresult && mysql_num_rows($nresult) > 0) {
?>
@@ -185,7 +185,7 @@
}
/* VARIANTS */
- $nquery = "SELECT variant FROM $portsdb.variants WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY variant";
+ $nquery = "SELECT variant FROM $portsdb_name.variants WHERE portfile='" . mysql_real_escape_string($row['name']) . "' ORDER BY variant";
$nresult = mysql_query($nquery);
if ($nresult && mysql_num_rows($nresult) > 0) {
?>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20071124/9d4adac4/attachment.html
More information about the macports-changes
mailing list