update branches to head

git-svn-id: file:///home/dpavlin/private/svn/webpac/branches/hidra@640 13eb9ef6-21d5-0310-b721-a9d68796d827

diff --git a/WebPac.pm b/WebPac.pm
index 4375ea5..e4d6448 100644 (file)
--- a/WebPac.pm
+++ b/WebPac.pm
@@ -270,7 +270,7 @@ sub show_results_list {
 
                if ($q->param("e$i")) {
                        push @url_params,"e$i=".$q->url_param("e$i");
-                       push @url_params_persist,"e$i=".$q->url_param("e$i");
+#                      push @url_params_persist,"e$i=".$q->url_param("e$i");
                }
 
                my $wc="*";     # swish wildcard
@@ -361,7 +361,7 @@ sub show_results_list {
 
        # create new swish instance
        my $swish = SWISH::API->new($INDEX);
-       $swish->AbortLastError if $swish->Error;
+       die $swish->ErrorString.": ".$swish->LastErrorMsg if $swish->Error;
 
        # execute query and get number of results from SWISH-E
        my $search = $swish->New_Search_Object;
@@ -369,7 +369,7 @@ sub show_results_list {
        $search->SetSort($sort);
 
        my $results = $search->Execute($sw_q);
-       $swish->AbortLastError if $swish->Error;
+       die $swish->ErrorString.": ".$swish->LastErrorMsg if $swish->Error;
 
        my $hits = $results->Hits;
 

diff --git a/back2html.pm b/back2html.pm
index 0fcf931..ba224c7 100644 (file)
--- a/back2html.pm
+++ b/back2html.pm
@@ -33,10 +33,12 @@ sub back2html {
        # put <a href=xxx>yyyy</a> back into html
        sub mkurl_param($$$$) {
                my ($a_href,$url,$text,$a_end) = @_;
-               if ($url =~ m#\?#) {
-                       $url .= "&".$url_params;
-               } else {
-                       $url .= "?".$url_params;
+               if ($url_params) {
+                       if ($url =~ m#\?#) {
+                               $url .= "&".$url_params;
+                       } else {
+                               $url .= "?".$url_params;
+                       }
                }
                return '<'.$a_href.'"'.$url.'">'.$text.'<'.$a_end.'>';
        }