[Koha-cvs] koha C4/Search.pm koha-tmpl/opac-tmpl/npl/en/in... [dev_week]

[Joshua Ferraro]

CVSROOT:        /sources/koha
Module name:    koha
Branch:         dev_week
Changes by:     Joshua Ferraro <kados>  06/07/23 22:08:19

Modified files:
        C4             : Search.pm 
        koha-tmpl/opac-tmpl/npl/en/includes: navigation.inc 
        koha-tmpl/opac-tmpl/npl/en/includes/tigra: tree_tpl.js 
        opac           : opac-zoomsearch.pl 

Log message:
        adding default facet option

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.99.2.11.2.9&r2=1.99.2.11.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4.2.3&r2=1.2.2.4.2.4
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/tigra/tree_tpl.js?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.1&r2=1.1.2.2
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-zoomsearch.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.13&r2=1.1.2.14

Patches:
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.11.2.9
retrieving revision 1.99.2.11.2.10
diff -u -b -r1.99.2.11.2.9 -r1.99.2.11.2.10
--- C4/Search.pm        23 Jul 2006 18:55:25 -0000      1.99.2.11.2.9
+++ C4/Search.pm        23 Jul 2006 22:08:18 -0000      1.99.2.11.2.10
@@ -35,7 +35,7 @@
 use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
 
 # set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.99.2.11.2.9 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.10 $' =~ /\d+/g;
           shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -4378,6 +4378,14 @@
         $author_facets.="]";
     }
  
+       # POPULATE DEFAULT FACETS
+       my $default_facets = C4::Context->preference("default_facets");
+       if (($subject_facets) or ($series_facets) or ($author_facets)) {
+       $facets.="var DEFAULT_TREE = '';\n";
+       }
+       else {
+       $facets.="var DEFAULT_TREE = '$default_facets';\n";
+       }
        # POPULATE SUBJECT FACETS
     if ($subject_facets) {
         $facets.="var SUBJECT_TREE = [

Index: koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2.2.4.2.3
retrieving revision 1.2.2.4.2.4
diff -u -b -r1.2.2.4.2.3 -r1.2.2.4.2.4
--- koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc  23 Jul 2006 18:02:09 
-0000      1.2.2.4.2.3
+++ koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc  23 Jul 2006 22:08:19 
-0000      1.2.2.4.2.4
@@ -22,6 +22,7 @@
     <tr><td class="intd">
         <script type="text/javascript" language="javascript">
             <!--
+                       new tree (DEFAULT_TREE, default_tpl);
                        new tree (SUBJECT_TREE, subject_tpl);
                        new tree (SERIES_TREE, series_tpl);
                        new tree (AUTHOR_TREE, author_tpl);

Index: koha-tmpl/opac-tmpl/npl/en/includes/tigra/tree_tpl.js
===================================================================
RCS file: 
/sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/tigra/Attic/tree_tpl.js,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -u -b -r1.1.2.1 -r1.1.2.2
--- koha-tmpl/opac-tmpl/npl/en/includes/tigra/tree_tpl.js       23 Jul 2006 
18:03:43 -0000      1.1.2.1
+++ koha-tmpl/opac-tmpl/npl/en/includes/tigra/tree_tpl.js       23 Jul 2006 
22:08:19 -0000      1.1.2.2
@@ -3,6 +3,38 @@
        User icons collections are welcome, we'll publish them giving all 
regards.
 */
 
+var default_tpl = {
+    'target'  : '_self',    // name of the frame links will be opened in
+                            // other possible values are: _blank, _parent, 
_search, _self and _top
+
+    'icon_e'  : '/opac-tmpl/npl/en/includes/tigra/icons/empty.gif', // empty 
image
+    'icon_l'  : '/opac-tmpl/npl/en/includes/tigra/icons/line.gif',  // 
vertical line
+
+    'icon_32' : 
'/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png',   // root 
leaf icon normal
+    'icon_36' : 
'/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png',   // root 
leaf icon selected
+
+    'icon_48' : 
'/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png',   // root 
icon normal
+    'icon_52' : 
'/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png',   // root 
icon selected
+    'icon_56' : 
'/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png',   // root 
icon opened
+    'icon_60' : 
'/opac-tmpl/npl/en/includes/tigra/icons/application_side_boxes.png',   // root 
icon selected
+
+//  'icon_16' : '/opac-tmpl/npl/en/includes/tigra/icons/application_go.png', 
// node icon normal
+//  'icon_20' : 
'/opac-tmpl/npl/en/includes/tigra/icons/application_side_expand.png', // node 
icon selected
+//  'icon_24' : 
'/opac-tmpl/npl/en/includes/tigra/icons/application_side_expand.png', // node 
icon opened
+//  'icon_28' : 
'/opac-tmpl/npl/en/includes/tigra/icons/application_side_expand.png', // node 
icon selected opened
+
+//  'icon_0'  : '/opac-tmpl/npl/en/includes/tigra/icons/application_go.png', 
// leaf icon normal
+//  'icon_4'  : '/opac-tmpl/npl/en/includes/tigra/icons/page.gif', // leaf 
icon selected
+
+    'icon_2'  : '/opac-tmpl/npl/en/includes/tigra/icons/joinbottom.gif', // 
junction for leaf
+    'icon_3'  : '/opac-tmpl/npl/en/includes/tigra/icons/join.gif',       // 
junction for last leaf
+    'icon_18' : '/opac-tmpl/npl/en/includes/tigra/icons/plusbottom.gif', // 
junction for closed node
+    'icon_19' : '/opac-tmpl/npl/en/includes/tigra/icons/plus.gif',       // 
junctioin for last closed node
+    'icon_26' : '/opac-tmpl/npl/en/includes/tigra/icons/minusbottom.gif',// 
junction for opened node
+    'icon_27' : '/opac-tmpl/npl/en/includes/tigra/icons/minus.gif'       // 
junctioin for last opended node
+};
+
+
 var subject_tpl = {
        'target'  : '_self',    // name of the frame links will be opened in
                                                        // other possible 
values are: _blank, _parent, _search, _self and _top

Index: opac/opac-zoomsearch.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-zoomsearch.pl,v
retrieving revision 1.1.2.13
retrieving revision 1.1.2.14
diff -u -b -r1.1.2.13 -r1.1.2.14
--- opac/opac-zoomsearch.pl     23 Jul 2006 18:55:25 -0000      1.1.2.13
+++ opac/opac-zoomsearch.pl     23 Jul 2006 22:08:19 -0000      1.1.2.14
@@ -305,10 +305,10 @@
 
        # set the default tab, etc.
        my $search_type = $query->param('query_form');
-       if ((!$search_type) || ($search_type eq 'ccl'))  {
-               $template->param(simple_search => 1);
-       } elsif ($search_type eq 'advanced') {
+       if ((!$search_type) || ($search_type eq 'advanced'))  {
                $template->param(advanced_search => 1);
+       } elsif ($search_type eq 'format') {
+               $template->param(format_search => 1);
        } elsif ($search_type eq 'power') {
                $template->param(power_search => 1);
        } elsif ($search_type eq 'cql') {