Update of /cvsroot/fink/web/pdb
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv2463
Modified Files:
browse.php handle_options.inc header.inc
Log Message:
update supported list; fix section issues
Index: handle_options.inc
===================================================================
RCS file: /cvsroot/fink/web/pdb/handle_options.inc,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- handle_options.inc 6 Jan 2008 16:20:25 -0000 1.15
+++ handle_options.inc 7 Sep 2009 04:10:15 -0000 1.16
@@ -35,8 +35,8 @@
array_push($_desc, "Architecture = '" . $_GET['architecture'] .
"'");
if (!empty($_GET['tree']) && $_GET['tree'] != $default_tree)
array_push($_desc, "Tree = '" . $_GET['tree'] . "'");
- if (!empty($_GET['section']))
- array_push($_desc, "Section = '" . $_GET['section'] . "'");
+ if (!empty($_GET['sec']))
+ array_push($_desc, "Section = '" . $_GET['sec'] . "'");
if (!empty($_GET['depends']))
array_push($_desc, "Depends = '" . $_GET['depends'] . "'");
if (!empty($_GET['builddepends']))
@@ -62,7 +62,7 @@
addGETParam($_getparams, 'dist_name');
addGETParam($_getparams, 'architecture');
addGETParam($_getparams, 'tree');
- addGETParam($_getparams, 'section');
+ addGETParam($_getparams, 'sec');
addGETParam($_getparams, 'nochildren');
addGETParam($_getparams, 'noshlibsdev');
addGETParam($_getparams, 'showall');
@@ -124,9 +124,9 @@
if (empty($tree)) $tree = $default_tree;
if (!empty($tree) && $tree != $default_tree) $pdb_has_adv_searchoptions = true;
-list($section, $inv_p) = get_safe_param('section', '/^[a-z0-9\+\-\.\/]+$/');
+list($sec, $inv_p) = get_safe_param('sec', '/^[a-z0-9\+\-\.\/]+$/');
$invalid_param = $invalid_param || $inv_p;
-if (!empty($section)) $pdb_has_adv_searchoptions = true;
+if (!empty($sec)) $pdb_has_adv_searchoptions = true;
$nochildren = $_GET['nochildren'];
if ($nochildren != "on") $nochildren = '';
@@ -195,7 +195,7 @@
if ($dist)
$query->addQuery("dist_id:\"$dist\"", true);
if ($dist_name == $default_dist)
- $query->addQuery("+(dist_name:\"10.4\" OR dist_name:\"10.5\")");
+ $query->addQuery("+(dist_name:\"10.5\" OR dist_name:\"10.6\")");
elseif ($dist_name != 'any')
$query->addQuery("dist_name:\"$dist_name\"", true);
if ($architecture)
@@ -227,17 +227,17 @@
if (!empty($summary))
$query->addQuery("text:\"$summary\"", true);
-if (!empty($section)) {
- $section_query = "section:\"$section\"";
+if (!empty($sec)) {
+ $section_query = "section:\"$sec\"";
- if ($section == "games")
- $section_query = "(section:\"$section\" OR parentname:games OR
parentname:toys)";
- elseif ($section == "graphics")
- $section_query = "(section:\"$section\" OR
parentname:graphics)";
- elseif ($section == "sound")
- $section_query = "(section:\"$section\" OR
parentname:multimedia)";
- elseif ($section == "utils") {
- $section_query = "((section:\"$section\" OR parentname:utils)
AND NOT parentname:webmin)";
+ if ($sec == "games")
+ $section_query = "(section:\"$sec\" OR parentname:games OR
parentname:toys)";
+ elseif ($sec == "graphics")
+ $section_query = "(section:\"$sec\" OR parentname:graphics)";
+ elseif ($sec == "sound")
+ $section_query = "(section:\"$sec\" OR parentname:multimedia)";
+ elseif ($sec == "utils") {
+ $section_query = "((section:\"$sec\" OR parentname:utils) AND
NOT parentname:webmin)";
}
$query->addQuery($section_query, true);
Index: header.inc
===================================================================
RCS file: /cvsroot/fink/web/pdb/header.inc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -d -r1.21 -r1.22
--- header.inc 7 Dec 2007 14:50:32 -0000 1.21
+++ header.inc 7 Sep 2009 04:10:15 -0000 1.22
@@ -5,6 +5,7 @@
$localroot = "http://pdb.finkproject.org/";;
$pdbroot = $localroot . "pdb/";
+$section = 'packages';
$disabled = false;
$server = $_SERVER['SERVER_NAME'];
Index: browse.php
===================================================================
RCS file: /cvsroot/fink/web/pdb/browse.php,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- browse.php 18 Dec 2007 17:19:46 -0000 1.27
+++ browse.php 7 Sep 2009 04:10:15 -0000 1.28
@@ -60,7 +60,7 @@
// Distribution values
$dist_values = array(
'any' => 'Any',
- 'default' => 'Supported (10.4 and 10.5)',
+ 'default' => 'Supported (10.5 and 10.6)',
);
foreach ($distributions as $d) {
if (!$showall and !$d->isVisible()) {
@@ -130,7 +130,7 @@
<tr><td>Distribution:</td><td><?genFormSelect("dist_name", $dist_name,
$dist_values);?></td></tr>
<tr><td>Architecture:</td><td><?genFormSelect("architecture", $architecture,
$arch_values);?></td></tr>
<tr><td>Tree:</td> <td><?genFormSelect("tree", $tree,
$tree_values);?></td></tr>
-<tr><td>Section:</td> <td><?genFormSelect("section", $section,
$section_values);?></td></tr>
+<tr><td>Section:</td> <td><?genFormSelect("sec", $sec,
$section_values);?></td></tr>
<!-- <tr><td>Sort order:</td> <td><? // genFormSelect("sort", $sort,
$sort_values); ?></td></tr> -->
</table>
------------------------------------------------------------------------------
Let Crystal Reports handle the reporting - Free Crystal Reports 2008 30-Day
trial. Simplify your report design, integration and deployment - and focus on
what you do best, core application coding. Discover what's new with
Crystal Reports now. http://p.sf.net/sfu/bobj-july
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
