[Archive-access-cvs] archive-access/projects/wera/src/webapps/wera index.php,1.6,1.7 overview.php,1.4,1.5

[Sverre B. <sv...@us...>]

Update of /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv13188

Modified Files:
	index.php overview.php 
Log Message:
Improved debug output

Index: overview.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/overview.php,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** overview.php	5 Oct 2005 22:42:47 -0000	1.4
--- overview.php	19 Oct 2005 13:36:59 -0000	1.5
***************
*** 117,121 ****
  		$total = $s->getNumHitsTotal();
  		$rset = $s->getResultSet();
! 		if ($conf_debug == 1) {
  			print "<pre>";
  			print_r($rset);
--- 117,123 ----
  		$total = $s->getNumHitsTotal();
  		$rset = $s->getResultSet();
! 		if ($conf_debug == 1 or $debug) {
! 			print "DEBUG : Query url : <a href=\"" . $s->queryurl . "\">" . $s->queryurl . "</a><br>&nbsp;<br>";
! 			print "<br>&nbsp<br>DEBUG : Result set :";
  			print "<pre>";
  			print_r($rset);

Index: index.php
===================================================================
RCS file: /cvsroot/archive-access/archive-access/projects/wera/src/webapps/wera/index.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** index.php	12 Oct 2005 13:25:29 -0000	1.6
--- index.php	19 Oct 2005 13:36:59 -0000	1.7
***************
*** 232,246 ****
  			$total = $search->getNumHitsTotal();
  			$results = $search->getResultSet();
! 
! 			if ($conf_debug == 1) {
! 				print "Query url : <a href=\"" . $search->queryurl . "\">" . $search->queryurl . "</a>";
! 				print "<pre>";
! 				print_r($results);
! 				print "</pre>";
  			}
  			if ($total > 0) {
  				print (nls("Total number of versions found")." : <b>$total</b>. ");
  				print (nls("Displaying URL's"));
! 				print " <b>$start-$numhits";
  				print "</td></tr>";
  				print "<tr><td class=\"norm\">";
--- 232,242 ----
  			$total = $search->getNumHitsTotal();
  			$results = $search->getResultSet();
! 			if ($conf_debug or $debug) {
! 				print "DEBUG : Query url : <a href=\"" . $search->queryurl . "\">" . $search->queryurl . "</a><br>&nbsp;<br>";
  			}
  			if ($total > 0) {
  				print (nls("Total number of versions found")." : <b>$total</b>. ");
  				print (nls("Displaying URL's"));
! 				print " <b>$start-$numhits</b>";
  				print "</td></tr>";
  				print "<tr><td class=\"norm\">";
***************
*** 268,272 ****
  								$versions = $search2->getResultSet();
  								$numversions = $search2->getNumHitsTotal();
! 								if ($conf_debug == 1) {
  									$count_versions_matching_queryurl = $search2->queryurl;
  								}
--- 264,268 ----
  								$versions = $search2->getResultSet();
  								$numversions = $search2->getNumHitsTotal();
! 								if ($conf_debug or $debug) {
  									$count_versions_matching_queryurl = $search2->queryurl;
  								}
***************
*** 283,287 ****
  						if ($search2->doQuery()) {
  							$totalversions = $search2->getNumHitsTotal();
! 							if ($conf_debug == 1) {
  								$count_versions_total_queryurl = $search2->queryurl;
  							}							
--- 279,283 ----
  						if ($search2->doQuery()) {
  							$totalversions = $search2->getNumHitsTotal();
! 							if ($conf_debug or $debug) {
  								$count_versions_total_queryurl = $search2->queryurl;
  							}							
***************
*** 294,303 ****
  						print $numversions_text1 . " ";
  						print $numversions_text2 . $totalversions."<br>";
! 						if ($conf_debug == 1) {
  							if (isset($count_versions_matching_queryurl)) {
! 								print "Url for counting versions matching query : <a href=\"" . $count_versions_matching_queryurl. "\">" . $count_versions_matching_queryurl . "</a><br/>"; 
  							}
  							if (isset($count_versions_total_queryurl)) {
! 								print "Url for counting versions total : <a href=\"" . $count_versions_total_queryurl. "\">" . $count_versions_total_queryurl . "</a><br/>"; 
  							}							
  						}
--- 290,299 ----
  						print $numversions_text1 . " ";
  						print $numversions_text2 . $totalversions."<br>";
! 						if ($conf_debug or $debug) {
  							if (isset($count_versions_matching_queryurl)) {
! 								print "DEBUG : Url for counting versions matching query : <a href=\"" . $count_versions_matching_queryurl. "\">" . $count_versions_matching_queryurl . "</a><br/>"; 
  							}
  							if (isset($count_versions_total_queryurl)) {
! 								print "DEBUG : Url for counting versions total : <a href=\"" . $count_versions_total_queryurl. "\">" . $count_versions_total_queryurl . "</a><br/>"; 
  							}							
  						}
***************
*** 357,364 ****
--- 353,368 ----
  					print "  <a href=\"".$_SERVER['PHP_SELF']."?".$url_querypart."&start=".$next_start."\">".nls("Next")." &gt;&gt;</a>";
  				}
+ 				print "</b>";
  
  			} else {
  				print "No hits!";
  			}
+ 			if ($conf_debug or $debug) {
+ 				print "<br>&nbsp<br>DEBUG : Result set :";
+ 				print "<pre>";
+ 				print_r($results);
+ 				print "</pre>";
+ 			}
+ 		
  		}
  		else {