fixed build to copy over Evergreen perl mods

removed some unused code

git-svn-id: svn://svn.open-ils.org/ILS/trunk@2557 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Evergreen/Makefile b/Evergreen/Makefile
index 97124b1..2d32fa7 100644 (file)
--- a/Evergreen/Makefile
+++ b/Evergreen/Makefile
@@ -10,7 +10,7 @@ NEW_XUL_PACKAGE_LABEL=OpenILS
 
 all:   xul 
 
-install:       circ-install iplist-install
+install:       circ-install iplist-install perl-install
 
 xul:
        @echo $@

diff --git a/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm b/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm
index 6fa1d53..72505d9 100644 (file)
--- a/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm
+++ b/Open-ILS/src/perlmods/OpenILS/WWW/Redirect.pm
@@ -40,7 +40,7 @@ sub handler {
        my $proto = "http";
        if($cgi->https) { $proto = "https"; }
 
-       my $url = "$proto://$hostname:$port/opac/skin/default/xml/index.xml";
+       my $url = "$proto://$hostname:$port/opac/skin/en-US/default/xml/index.xml";
 
        my $path = $apache_obj->path_info();
 

diff --git a/Open-ILS/web/opac/skin/default/js/sidebar_extras.js b/Open-ILS/web/opac/skin/default/js/sidebar_extras.js
index 3ded13b..fd8ea37 100644 (file)
--- a/Open-ILS/web/opac/skin/default/js/sidebar_extras.js
+++ b/Open-ILS/web/opac/skin/default/js/sidebar_extras.js
@@ -54,7 +54,6 @@ function resultDrawSeries() {
                $("series_sidebar_tree_div") );
 }
 
-var _oldFashioned = true;
 var IESux = true;
 
 function resultDrawSidebarTrees( stype, treeName, items, wrapperNode, destNode ) {
@@ -80,8 +79,7 @@ function resultDrawSidebarTrees( stype, treeName, items, wrapperNode, destNode )
                var href = resultQuickLink( items[i], stype );
                tree.addNode( stype + "_" + items[i], treeName + 'Root', item, href );
 
-               ////if(_oldFashioned && !IE) {
-               if(_oldFashioned && !IE ) resultFireXRefReq(treeName, stype, items[i]);
+               if( !IE ) resultFireXRefReq(treeName, stype, items[i]);
 
                var a = {};
                a.type = stype;
@@ -91,14 +89,11 @@ function resultDrawSidebarTrees( stype, treeName, items, wrapperNode, destNode )
 
        if(found) {
                unHideMe(wrapperNode);
-               if(!_oldFashioned)
-                       resultFireXRefBatch(treeName, xrefCache, stype);
-               //if(IE && stype == 'subject' ) {
-
                if(IE) resultFireXRefSingle(treeName, xrefCache, stype);
        }
 }
 
+/*
 function resultFireXRefBatch(treeName, xrefCache, stype) {
        var query = [];
        for( var i = 0; i != xrefCache.length; i++ ) {
@@ -113,6 +108,7 @@ function resultFireXRefBatch(treeName, xrefCache, stype) {
        req.callback(resultRenderXRefTree);
        req.send();
 }
+*/
 
 var xrefCacheIndex = {};
 xrefCacheIndex['subject'] = 0;
@@ -127,6 +123,7 @@ function resultHandleXRefResponse(r) {
 
 function resultFireXRefSingle( treeName, xrefCache, stype ) {
        var i = xrefCacheIndex[stype]++;
+       if(xrefCache[i] == null) return;
        var item = xrefCache[i].term;
        var tree;
        eval('tree=' + treeName);
@@ -161,6 +158,7 @@ function resultQuickLink( term, type ) {
        return buildOPACLink(args);
 }
 
+/*
 function resultRenderXRefTree(r) {
        var tree = r._tree;
        var res = r.getResultObject();
@@ -189,6 +187,7 @@ function resultRenderXRefTree(r) {
                }
        }
 }
+*/
 
 
 function resultAppendCrossRef(r) {

diff --git a/install.sh b/install.sh
index b142eee..98dfe6f 100755 (executable)
--- a/install.sh
+++ b/install.sh
@@ -210,6 +210,7 @@ function runInstall {
                        "evergreen_core" )
                                if installing;  then $MAKE -C "$EVERGREENDIR" "circ-install"; fi;
                                if installing;  then $MAKE -C "$EVERGREENDIR" "iplist-install"; fi;
+                               if installing;  then $MAKE -C "$EVERGREENDIR" "perl-install"; fi;
                                ;;      
 
                        "evergreen_xul_client" )