From 66f69d475f74260170e0703e670a9870ab087f29 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 5 Jul 2007 15:31:22 +0000 Subject: feed-browser: include architecture selector --- contrib/feed-browser/includes/functions.inc | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'contrib/feed-browser/includes/functions.inc') diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc index 2532dd7c08..5549aa578d 100644 --- a/contrib/feed-browser/includes/functions.inc +++ b/contrib/feed-browser/includes/functions.inc @@ -129,6 +129,17 @@ function searchpkg ($searchword) } } + +function searchpkgarch ($searchword, $searcharch) +{ + if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' AND p_arch LIKE '$searcharch' ORDER BY p_name ASC")) + { + return generate_list_of_packages($result); + } +} + + + function generate_list_of_packages($query_result) { $ipkgoutput = "\n"; @@ -443,7 +454,7 @@ function check_database() f_name varchar(32), f_uri varchar(100), f_type varchar(16) - )"); + f_comments varchar(500))"); insert_feeds ($db) ; } -- cgit v1.2.3 From 50fbbdb83e90403447b95b326ebe825ea325e605 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 5 Jul 2007 15:37:56 +0000 Subject: feed-browser: exit if database cannot be found or created --- contrib/feed-browser/includes/functions.inc | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'contrib/feed-browser/includes/functions.inc') diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc index 5549aa578d..ad8e57e93b 100644 --- a/contrib/feed-browser/includes/functions.inc +++ b/contrib/feed-browser/includes/functions.inc @@ -422,8 +422,12 @@ function sectionslist() function check_database() { - if($db = sqlite_open(DB_FILENAME)) + $db_exists = FALSE; + + if(file_exists(DB_FILENAME) AND $db = sqlite_open(DB_FILENAME)) { + $db_exists = TRUE; + //initialize db if (db_table_exists ($db, 'packages') === FALSE) { @@ -461,6 +465,8 @@ function check_database() sqlite_close($db); } + + return $db_exists; } -- cgit v1.2.3 From 50f95eae1601cd8f5e5c82821000061fef6d99e6 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 5 Jul 2007 15:38:49 +0000 Subject: feed-browser: updated copyrights --- contrib/feed-browser/includes/functions.inc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'contrib/feed-browser/includes/functions.inc') diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc index ad8e57e93b..03947c9998 100644 --- a/contrib/feed-browser/includes/functions.inc +++ b/contrib/feed-browser/includes/functions.inc @@ -1,7 +1,7 @@ Date: Thu, 5 Jul 2007 15:56:42 +0000 Subject: feed-browser: use read_vars_from_get to handle HTTP GET params --- contrib/feed-browser/includes/functions.inc | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) (limited to 'contrib/feed-browser/includes/functions.inc') diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc index 03947c9998..80e4256b5e 100644 --- a/contrib/feed-browser/includes/functions.inc +++ b/contrib/feed-browser/includes/functions.inc @@ -112,11 +112,11 @@ function searchletter($searchletter = '') } else { - $ipkgoutput .= sprintf(" %s |", $letter, $letter, $letter ); + $ipkgoutput .= sprintf(" %s |", $letter, $letter, $letter ); } } - $ipkgoutput .= " z"; + $ipkgoutput .= " z"; return $ipkgoutput; } @@ -469,6 +469,17 @@ function check_database() return $db_exists; } +function read_vars_from_get($array_of_vars) +{ + foreach($array_of_vars as $name_of_var) + { + $GLOBALS[$name_of_var] = ''; + if(isset($_GET[$name_of_var])) + { + $GLOBALS[$name_of_var] = $_GET[$name_of_var]; + } + } +} ?> -- cgit v1.2.3 From b0dc3a8d1dc7e79b7960ee7503d80a7d43b8793f Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 5 Jul 2007 16:15:03 +0000 Subject: feed-browser: simplified URLs (no 'action' var anymore), simplified code a bit --- contrib/feed-browser/includes/functions.inc | 38 ++++++++++++++--------------- 1 file changed, 18 insertions(+), 20 deletions(-) (limited to 'contrib/feed-browser/includes/functions.inc') diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc index 80e4256b5e..23c7321a07 100644 --- a/contrib/feed-browser/includes/functions.inc +++ b/contrib/feed-browser/includes/functions.inc @@ -112,34 +112,32 @@ function searchletter($searchletter = '') } else { - $ipkgoutput .= sprintf(" %s |", $letter, $letter, $letter ); + $ipkgoutput .= sprintf(" %s |", $letter, $letter, $letter ); } } - $ipkgoutput .= " z"; + $ipkgoutput .= " z"; return $ipkgoutput; } -function searchpkg ($searchword) +function searchpkg ($searchword, $searcharch = '') { - if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' ORDER BY p_name ASC")) + $query = "SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' "; + + if(!empty($searcharch)) { - return generate_list_of_packages($result); + $query .= " AND p_arch='{$searcharch}' "; } -} - -function searchpkgarch ($searchword, $searcharch) -{ - if($result = db_query("SELECT DISTINCT p_name,p_desc,p_section FROM packages WHERE p_name LIKE '$searchword' AND p_arch LIKE '$searcharch' ORDER BY p_name ASC")) - { - return generate_list_of_packages($result); + $query .= 'ORDER BY p_name ASC'; + + if($result = db_query($query)) + { + return generate_list_of_packages($result); } } - - function generate_list_of_packages($query_result) { $ipkgoutput = "
\n"; @@ -160,7 +158,7 @@ function generate_list_of_packages($query_result) } $ipkgoutput .= sprintf - ("\n", + ("\n", urlencode($package['p_name']), $package['p_name'], $package['p_section'], $package['p_section'], htmlentities($package['p_desc'])); } @@ -205,7 +203,7 @@ function pkgdetails ($package) if($package['packages.p_section']) { - $details .= sprintf ("\n
Section:
%s
", $package['packages.p_section'],$package['packages.p_section']); + $details .= sprintf ("\n
Section:
%s
", $package['packages.p_section'],$package['packages.p_section']); } if($package['packages.p_depends']) @@ -321,7 +319,7 @@ function addlinks ($input) { // find position of string in line $pos = strpos ($input, $element, $offset); - $link = sprintf("$element", urlencode ($element)); + $link = sprintf("$element", urlencode ($element)); // replace element with a link $input = substr_replace ($input, $link, $pos, strlen ($element)); @@ -372,7 +370,7 @@ function sectionslist() foreach($sections as $section_name1=>$item) { - $output .= sprintf ("
  • %s", + $output .= sprintf ("
  • %s", urlencode($section_name1), urlencode($section_name1), $section_name1); @@ -384,7 +382,7 @@ function sectionslist() foreach($item as $section_name2=>$subitem) { $section_name = "{$section_name1}/{$section_name2}"; - $output .= sprintf ("
  • %s", + $output .= sprintf ("
  • %s", urlencode($section_name), urlencode($section_name), $section_name2); @@ -396,7 +394,7 @@ function sectionslist() foreach($subitem as $section_name3=>$subitem2) { $section_name = "{$section_name1}/{$section_name2}/{$section_name3}"; - $output .= sprintf ("
  • %s
    • ", + $output .= sprintf ("
  • %s
    • ", urlencode($section_name), urlencode($section_name), $section_name3); -- cgit v1.2.3 From f35bb30a937dafbafc3653e62108026270620a98 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 5 Jul 2007 16:33:02 +0000 Subject: feed-browser: list of architectures from database instead of static list --- contrib/feed-browser/includes/functions.inc | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'contrib/feed-browser/includes/functions.inc') diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc index 23c7321a07..d49851f5b1 100644 --- a/contrib/feed-browser/includes/functions.inc +++ b/contrib/feed-browser/includes/functions.inc @@ -480,4 +480,8 @@ function read_vars_from_get($array_of_vars) } } +function get_arch_list() +{ + return db_query('SELECT DISTINCT p_arch FROM packages WHERE p_arch NOT IN (NULL, "", "all") ORDER BY p_arch ASC'); +} ?> -- cgit v1.2.3 From 23b52f7850b0d375e908c598f0eb8dbe9d433d96 Mon Sep 17 00:00:00 2001 From: Marcin Juszkiewicz Date: Thu, 5 Jul 2007 16:37:50 +0000 Subject: feed-browser: in package details sort by version, then by arch --- contrib/feed-browser/includes/functions.inc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/feed-browser/includes/functions.inc') diff --git a/contrib/feed-browser/includes/functions.inc b/contrib/feed-browser/includes/functions.inc index d49851f5b1..8b64ca345b 100644 --- a/contrib/feed-browser/includes/functions.inc +++ b/contrib/feed-browser/includes/functions.inc @@ -182,7 +182,7 @@ function pkgdetails ($package) $result = db_query("SELECT * FROM packages,feeds WHERE (packages.p_name='$package' OR packages.p_provides='$package') AND feeds.f_id = packages.p_feed - ORDER BY packages.p_version DESC, feeds.f_name ASC, packages.p_arch DESC "); + ORDER BY packages.p_version DESC, packages.p_arch ASC "); // display first result -- cgit v1.2.3
    %s%s %s
    %s%s %s