Thu Jul 31 11:45:32 EDT 2008

Author: erickson
Date: 2008-07-31 11:45:25 -0400 (Thu, 31 Jul 2008)
New Revision: 10218

Added:
   branches/acq-experiment/Open-ILS/web/opac/extras/selfcheck/
Modified:
   branches/acq-experiment/
   branches/acq-experiment/Evergreen/xul/staff_client/server/patron/ue.js
   branches/acq-experiment/Open-ILS/examples/apache/eg.conf
   branches/acq-experiment/Open-ILS/examples/apache/eg_vhost.conf
   branches/acq-experiment/Open-ILS/examples/fm_IDL.xml
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
   branches/acq-experiment/Open-ILS/src/sql/Pg/010.schema.biblio.sql
   branches/acq-experiment/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
   branches/acq-experiment/Open-ILS/src/sql/Pg/build-db.sh
   branches/acq-experiment/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
   branches/acq-experiment/Open-ILS/web/opac/locale/en-US/opac.dtd
   branches/acq-experiment/Open-ILS/web/opac/skin/default/css/layout.css
   branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
   branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
   branches/acq-experiment/Open-ILS/xul/staff_client/server/cat/copy_browser.js
Log:
Merged revisions 10174,10177-10179,10188,10190-10191,10193-10195,10199,10201-10202,10205,10208,10211-10216 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r10174 | dbs | 2008-07-29 14:05:23 -0400 (Tue, 29 Jul 2008) | 2 lines
  
  Add default conify configuration to eg_vhost.conf
........
  r10177 | miker | 2008-07-29 14:40:11 -0400 (Tue, 29 Jul 2008) | 1 line
  
  removing unnecessary SetEnv[If] stuff
........
  r10178 | miker | 2008-07-29 15:10:57 -0400 (Tue, 29 Jul 2008) | 1 line
  
  thinko ... use the responder, which has the session, not the method pointer
........
  r10179 | miker | 2008-07-29 16:56:38 -0400 (Tue, 29 Jul 2008) | 1 line
  
  preferred language and date filter fixes
........
  r10188 | erickson | 2008-07-30 13:07:19 -0400 (Wed, 30 Jul 2008) | 6 lines
  
  Basic web-based selfcheck interface.  This interface implements a subset of 
  
  http://open-ils.org/dokuwiki/doku.php?id=scratchpad:simple_self_check
........
  r10190 | erickson | 2008-07-30 13:09:39 -0400 (Wed, 30 Jul 2008) | 1 line
  
  oops, forgot the aliasmatch locale extraction for selfcheck
........
  r10191 | miker | 2008-07-30 13:37:44 -0400 (Wed, 30 Jul 2008) | 1 line
  
  add a reasonable prefix to autogenerated TCNs
........
  r10193 | erickson | 2008-07-30 14:01:28 -0400 (Wed, 30 Jul 2008) | 1 line
  
  falling back to existing is_true method
........
  r10194 | miker | 2008-07-30 14:17:19 -0400 (Wed, 30 Jul 2008) | 1 line
  
  adjustment to previous fix (create or replace ... so it it cut-n-paste friendly)
........
  r10195 | miker | 2008-07-30 14:18:53 -0400 (Wed, 30 Jul 2008) | 1 line
  
  ... and a typo fix to the fix
........
  r10199 | miker | 2008-07-30 22:51:44 -0400 (Wed, 30 Jul 2008) | 1 line
  
  dependency ordering of config functions
........
  r10201 | miker | 2008-07-30 23:56:24 -0400 (Wed, 30 Jul 2008) | 1 line
  
  dojo-based locale switcher
........
  r10202 | miker | 2008-07-31 00:08:39 -0400 (Thu, 31 Jul 2008) | 1 line
  
  replace does not, um, replace in place
........
  r10205 | miker | 2008-07-31 00:57:07 -0400 (Thu, 31 Jul 2008) | 1 line
  
  moving the lang switcher to a more reasonable location
........
  r10208 | phasefx | 2008-07-31 01:05:11 -0400 (Thu, 31 Jul 2008) | 1 line
  
  In Holdings Maintenance, we used to disable some render child behavior for the top of the org hierarchy, to prevent in the case of PINES, 200-odd libraries from being retrieved and rendered.  Now we check the can_have_vols for that org as well, to allow the interface to work with a single-org hierarchy
........
  r10211 | phasefx | 2008-07-31 01:13:12 -0400 (Thu, 31 Jul 2008) | 1 line
  
  we want to explicitly set net access level for new users or the db will provide a default
........
  r10212 | miker | 2008-07-31 01:21:54 -0400 (Thu, 31 Jul 2008) | 1 line
  
  make locale names and descriptions translatable
........
  r10213 | miker | 2008-07-31 01:22:51 -0400 (Thu, 31 Jul 2008) | 1 line
  
  more locale switch work
........
  r10214 | miker | 2008-07-31 01:40:58 -0400 (Thu, 31 Jul 2008) | 1 line
  
  make log message conditional
........
  r10215 | miker | 2008-07-31 01:46:01 -0400 (Thu, 31 Jul 2008) | 1 line
  
  use the correct field as the pkey
........
  r10216 | dbs | 2008-07-31 09:10:18 -0400 (Thu, 31 Jul 2008) | 2 lines
  
  Hush schema build messages that obscure potential real problems
........



Property changes on: branches/acq-experiment
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk:1-10172
   + /trunk:1-10217

Modified: branches/acq-experiment/Evergreen/xul/staff_client/server/patron/ue.js
===================================================================

--- branches/acq-experiment/Evergreen/xul/staff_client/server/patron/ue.js	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Evergreen/xul/staff_client/server/patron/ue.js	2008-07-31 15:45:25 UTC (rev 10218)
@@ -229,6 +229,7 @@
 	card.isnew(1);
 	patron.card(card);
 	patron.cards([card]);
+    patron.net_access_level(defaultNetLevel);
 	patron.stat_cat_entries([]);
 	patron.survey_responses([]);
 	patron.addresses([]);

Modified: branches/acq-experiment/Open-ILS/examples/apache/eg.conf
===================================================================
--- branches/acq-experiment/Open-ILS/examples/apache/eg.conf	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/examples/apache/eg.conf	2008-07-31 15:45:25 UTC (rev 10218)
@@ -46,6 +46,7 @@
 # ----------------------------------------------------------------------------------
 AliasMatch ^/opac/.*/skin/(.*)/(.*)/(.*) /openils/var/web/opac/skin/$1/$2/$3
 AliasMatch ^/opac/.*/extras/slimpac/(.*) /openils/var/web/opac/extras/slimpac/$1
+AliasMatch ^/opac/.*/extras/selfcheck/(.*) /openils/var/web/opac/extras/selfcheck/$1
 
 
 

Modified: branches/acq-experiment/Open-ILS/examples/apache/eg_vhost.conf
===================================================================
--- branches/acq-experiment/Open-ILS/examples/apache/eg_vhost.conf	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/examples/apache/eg_vhost.conf	2008-07-31 15:45:25 UTC (rev 10218)
@@ -240,6 +240,21 @@
 </Location>
 
 # ----------------------------------------------------------------------------------
+# Selfcheck interface
+# ----------------------------------------------------------------------------------
+<LocationMatch .*/selfcheck.xml>
+    SetHandler perl-script
+    PerlSetVar OILSProxyTitle "Selfcheck Login"
+    PerlSetVar OILSProxyDescription "Please log in to activate the selfcheck interface"
+    PerlSetVar OILSProxyPermissions "STAFF_LOGIN"
+    PerlHandler OpenILS::WWW::Proxy
+    Options +ExecCGI
+    PerlSendHeader On
+    allow from all
+</LocationMatch>
+
+
+# ----------------------------------------------------------------------------------
 # Reports GUI
 # ----------------------------------------------------------------------------------
 <LocationMatch /reports/>
@@ -258,10 +273,31 @@
     allow from all
 </Location>
 
+# ----------------------------------------------------------------------------------
+# Conify - next-generation Evergreen administration interface
+# ----------------------------------------------------------------------------------
+RewriteEngine on
+RewriteRule ^/conify/.*/global/(.*)$ /conify/global/$1
+<Location /conify>
+    XMLEntStripPI "yes"
+    XMLEntEscapeScript "no"
+    XMLEntStripComments "yes"
+    XMLEntContentType "text/html; charset=utf-8"
+    AddOutputFilter INCLUDES .html
+ 
+    SetHandler perl-script
+    PerlSetVar OILSProxyTitle "Dojo Admin Login"
+    PerlSetVar OILSProxyDescription "Please log in to administer Evergreen"
+    PerlSetVar OILSProxyPermissions "STAFF_LOGIN"
+    PerlHandler OpenILS::WWW::Proxy
+    Options +ExecCGI
+    PerlSendHeader On
+    allow from all
+</Location>
+
 # OpenURL 0.1 searching based on OpenSearch
 RewriteEngine on
 RewriteMap openurl prg:/openils/bin/openurl_map.pl
 RewriteCond %{QUERY_STRING} (^.*$)
 RewriteRule ^/openurl$ ${openurl:%1} [NE,PT]
 
-

Modified: branches/acq-experiment/Open-ILS/examples/fm_IDL.xml
===================================================================
--- branches/acq-experiment/Open-ILS/examples/fm_IDL.xml	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/examples/fm_IDL.xml	2008-07-31 15:45:25 UTC (rev 10218)
@@ -3786,14 +3786,14 @@
 		<links/>
 	</class>
 	<class id="i18n_l" controller="open-ils.cstore" oils_obj:fieldmapper="config::i18n_locale" oils_persist:tablename="config.i18n_locale" oils_persist:field_safe="true">
-		<fields oils_persist:primary="id">
+		<fields oils_persist:primary="code">
 			<field name="isnew" oils_obj:array_position="0" oils_persist:virtual="true" />
 			<field name="ischanged" oils_obj:array_position="1" oils_persist:virtual="true" />
 			<field name="isdeleted" oils_obj:array_position="2" oils_persist:virtual="true" />
 			<field name="code" oils_obj:array_position="3" oils_persist:virtual="false" reporter:datatype="id" />
 			<field name="marc_code" oils_obj:array_position="4" oils_persist:virtual="false" reporter:datatype="text"/>
-			<field name="name" oils_obj:array_position="5" oils_persist:virtual="false" reporter:datatype="text"/>
-			<field name="description" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="text"/>
+			<field name="name" oils_obj:array_position="5" oils_persist:virtual="false" reporter:datatype="text" oils_persist:i18n="true"/>
+			<field name="description" oils_obj:array_position="6" oils_persist:virtual="false" reporter:datatype="text" oils_persist:i18n="true"/>
 		</fields>
 		<links/>
         <permacrud xmlns="http://open-ils.org/spec/opensrf/IDL/permacrud/v1">

Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Circ/Circulate.pm	2008-07-31 15:45:25 UTC (rev 10218)
@@ -11,14 +11,6 @@
 my %scripts;
 my $script_libs;
 
-sub isTrue {
-    my $v = shift;
-    return 1 if ($v == 1);
-    return 1 if ($v =~ /^t/io);
-    return 1 if ($v =~ /^y/io);
-    return 0;
-}
-
 sub initialize {
 
     my $self = shift;
@@ -1072,7 +1064,7 @@
 
         # if is_percent is true then the max->amount is
         # use as a percentage of the copy price
-        if (isTrue($max->is_percent)) {
+        if ($U->is_true($max->is_percent)) {
 
             my $cn = $self->editor->retrieve_asset_call_number($copy->call_number);
 

Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Storage/Publisher/metabib.pm	2008-07-31 15:45:25 UTC (rev 10218)
@@ -2384,8 +2384,9 @@
 	my (@between, at statuses, at locations, at types, at forms, at lang, at aud, at lit_form, at vformats, at bib_level);
 
     if (!defined($args{preferred_language})) {
+		my $ses_locale = $client->session ? $client->session->session_locale : $default_preferred_language;
         $args{preferred_language} =
-            $locale_map{ $self->session->session_locale || $default_preferred_language } || 'eng';
+            $locale_map{ $ses_locale } || 'eng';
     }
 
     if (!defined($args{preferred_language_weight})) {

Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Utils/CStoreEditor.pm	2008-07-31 15:45:25 UTC (rev 10218)
@@ -766,7 +766,7 @@
         return undef;
     }
 
-    $self->log(I, "json_query : returned ".scalar(@$obj). " result(s)");
+    $self->log(I, "json_query : returned ".scalar(@$obj). " result(s)") if (ref($obj));
     return $obj;
 }
 

Modified: branches/acq-experiment/Open-ILS/src/sql/Pg/010.schema.biblio.sql
===================================================================
--- branches/acq-experiment/Open-ILS/src/sql/Pg/010.schema.biblio.sql	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/src/sql/Pg/010.schema.biblio.sql	2008-07-31 15:45:25 UTC (rev 10218)
@@ -21,8 +21,8 @@
 CREATE SCHEMA biblio;
 
 CREATE SEQUENCE biblio.autogen_tcn_value_seq;
-CREATE FUNCTION biblio.next_autogen_tcn_value () RETURNS TEXT AS $$
-	BEGIN RETURN nextval('biblio.autogen_tcn_value_seq'::TEXT); END;
+CREATE OR REPLACE FUNCTION biblio.next_autogen_tcn_value () RETURNS TEXT AS $$
+	BEGIN RETURN 'AUTOGENERATED-' || nextval('biblio.autogen_tcn_value_seq'::TEXT); END;
 $$ LANGUAGE PLPGSQL;
 
 CREATE TABLE biblio.record_entry (

Modified: branches/acq-experiment/Open-ILS/src/sql/Pg/300.schema.staged_search.sql
===================================================================
--- branches/acq-experiment/Open-ILS/src/sql/Pg/300.schema.staged_search.sql	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/src/sql/Pg/300.schema.staged_search.sql	2008-07-31 15:45:25 UTC (rev 10218)
@@ -344,7 +344,7 @@
         where_clause = where_clause || $$ AND $$ || quote_literal(param_during) || $$ BETWEEN mrd.date1 AND mrd.date2 $$;
     END IF;
 
-    IF param_between IS NOT NULL AND array_upper(param_between, 1) > 0 THEN
+    IF param_between IS NOT NULL AND array_upper(param_between, 1) > 1 THEN
         where_clause = where_clause || $$ AND mrd.date1 BETWEEN $$ || array_to_string(param_bib_level, $$' AND '$$) || ' ';
     END IF;
 

Modified: branches/acq-experiment/Open-ILS/src/sql/Pg/build-db.sh
===================================================================
--- branches/acq-experiment/Open-ILS/src/sql/Pg/build-db.sh	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/src/sql/Pg/build-db.sh	2008-07-31 15:45:25 UTC (rev 10218)
@@ -2,13 +2,14 @@
 
 # ---------------------------------------------------------------------------
 # Store command line args for later use
-# args: {db-host} {db-port} {db-name} {db-user} {db-password}
+# args: {db-host} {db-port} {db-name} {db-user} {db-password} {verbose}
 # ---------------------------------------------------------------------------
 PGHOST=$1
 PGPORT=$2
 PGDATABASE=$3
 PGUSER=$4
 PGPASSWORD=$5
+VERBOSE=$6
 export PGHOST PGPORT PGDATABASE PGUSER PGPASSWORD
 
 # ---------------------------------------------------------------------------
@@ -131,7 +132,12 @@
   # export ON_ERROR_STOP=1
 
   export PGHOST PGPORT PGDATABASE PGUSER PGPASSWORD
-  psql -f $sql_file
+  # Hide most of the harmless messages that obscure real problems
+  if [ -z "$VERBOSE" ]; then
+    psql -f $sql_file 2>&1 | grep -v NOTICE | grep -v "^INSERT"
+  else
+    psql -f $sql_file
+  fi
   if [ $? != 0 ]; then
     cat <<EOM
 ********************************************************************************

Modified: branches/acq-experiment/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js
===================================================================
--- branches/acq-experiment/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/web/js/dojo/fieldmapper/Fieldmapper.js	2008-07-31 15:45:25 UTC (rev 10218)
@@ -157,6 +157,7 @@
 
 	}
 
+	fieldmapper.i18n_l.Identifier = 'code';
 	fieldmapper.ppl.Identifier = 'code';
 	fieldmapper.ccm.Identifier = 'code';
 	fieldmapper.cvrfm.Identifier = 'code';

Copied: branches/acq-experiment/Open-ILS/web/opac/extras/selfcheck (from rev 10216, trunk/Open-ILS/web/opac/extras/selfcheck)

Modified: branches/acq-experiment/Open-ILS/web/opac/locale/en-US/opac.dtd
===================================================================
--- branches/acq-experiment/Open-ILS/web/opac/locale/en-US/opac.dtd	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/web/opac/locale/en-US/opac.dtd	2008-07-31 15:45:25 UTC (rev 10218)
@@ -6,6 +6,7 @@
 <!ENTITY lang.author "PINES">
 <!ENTITY common.all "All">
 <!ENTITY common.currency "$">
+<!ENTITY common.language "Language: ">
 <!ENTITY common.name "Name">
 <!ENTITY common.none "None">
 <!ENTITY common.title "Title">
@@ -634,3 +635,36 @@
 <!ENTITY opac.image_provided "Image provided by">
 <!ENTITY vendor.name "Amazon">
 <!ENTITY vendor.base_link "http://amazon.com/dp/">
+
+
+
+<!--	================================================================= 
+	Selfcheck
+	================================================================= -->
+<!ENTITY selfck.staff_login_label "Staff login">
+<!ENTITY selfck.staff_login "Library barcode or username">
+<!ENTITY selfck.staff_pw "Password">
+<!ENTITY selfck.submit "Submit">
+<!ENTITY selfck.patron_barcode_label "Please scan your library barcode">
+<!ENTITY selfck.item_barcode_label "Please scan an item to checkout or renew:">
+<!ENTITY selfck.barcode "Barcode">
+<!ENTITY selfck.title "Title">
+<!ENTITY selfck.author "Author">
+<!ENTITY selfck.due_date "Due Date">
+<!ENTITY selfck.remaining "Renewals Remaining">
+<!ENTITY selfck.cotype "Type">
+<!ENTITY selfck.cotype_co "Checkout">
+<!ENTITY selfck.cotype_rn "Renewal">
+<!ENTITY selfck.logout "Logout">
+<!ENTITY selfck.print_logout "Print &amp; Logout">
+<!ENTITY selfck.welcome "Welcome">
+
+<!-- event messages -->
+<!ENTITY selfck.event.co_success "Check out succeeded">
+<!ENTITY selfck.event.co_unknown "An unknown event has occurred">
+<!ENTITY selfck.event.dupe_barcode "This item has already been checked out during this session">
+<!ENTITY selfck.event.patron_not_found "The patron barcode was not found">
+<!ENTITY selfck.event.item_noncat "The requested item is not in the catalog">
+<!ENTITY selfck.event.item_nocirc "The requested item is not allowed to circulate">
+<!ENTITY selfck.print_checkouts "Print Receipt">
+

Modified: branches/acq-experiment/Open-ILS/web/opac/skin/default/css/layout.css
===================================================================
--- branches/acq-experiment/Open-ILS/web/opac/skin/default/css/layout.css	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/web/opac/skin/default/css/layout.css	2008-07-31 15:45:25 UTC (rev 10218)
@@ -74,7 +74,7 @@
 
 /* ---------------------------------------------------------------------- */
 
-#searchbar { margin-top: 18px; width: 100%; }
+#searchbar { margin-top: 22px; width: 100%; }
 #searchbar table tr td {font-weight: bold; font-size: 8pt; }
 #searchbar select, input { border-collapse: collapse; font-size: 9pt; }
 .searchbar_item { margin: 3px; font-size: 9pt; } 

Modified: branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/common/fonts.xml
===================================================================
--- branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/common/fonts.xml	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/common/fonts.xml	2008-07-31 15:45:25 UTC (rev 10218)
@@ -1,10 +1,19 @@
 <div id='fonts_div'>
 
 	<div id='text_size_div' style='position:absolute; top: 2px; right: 6px;'>
-		<span>&common.textsize.title;</span>
-		<span><a href="javascript:void(0);" onclick="setFontSize('regular');"> &common.textsize.regular; </a></span>
-		<span> &common.textsize.separator; </span>
-		<span><a href="javascript:void(0);" onclick="setFontSize('large');"> &common.textsize.large; </a></span>
+		<span style='vertical-align: top;'>&common.textsize.title;</span>
+		<span style='vertical-align: top;'><a href="javascript:void(0);" onclick="setFontSize('regular');"> &common.textsize.regular; </a></span>
+		<span style='vertical-align: top;'> &common.textsize.separator; </span>
+		<span style='vertical-align: top;'><a href="javascript:void(0);" onclick="setFontSize('large');"> &common.textsize.large; </a></span>
+		<span style='vertical-align: top;'>&nbsp;<span style="font-weight:bold;">|</span>&nbsp;</span>
+		<span style='vertical-align: top;'>&common.language;</span>
+		<span id='translation_switch' dojoType="dijit.form.FilteringSelect" store="openils.I18N.localeStore" searchAttr="label" required="false">
+			<script type="dojo/label" event="onChange">
+				if (this.getValue()) {
+					location.href = location.href.replace( /opac\/[^\/]+\/skin/, 'opac/' + this.getValue() + '/skin');
+				}
+			</script>
+		</span>
 	</div>
 	
 </div>

Modified: branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/common/js_common.xml
===================================================================
--- branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/common/js_common.xml	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/web/opac/skin/default/xml/common/js_common.xml	2008-07-31 15:45:25 UTC (rev 10218)
@@ -35,12 +35,14 @@
 
     <!-- enable Dojo date picker -->
     <script language='javascript' type="text/javascript">
-        var djConfig = {parseOnLoad: true, isDebug: false},
-            locale,
-            lang,
-            bidi;
 
-        djConfig.locale = '<!--#echo var="locale"-->';
+        var djConfig = {parseOnLoad: true, isDebug: false}, lang, bidi;
+
+        var locale = location.href.replace( /.+opac\/([^\/]+)\/skin.+/, '$1' );
+        if (!locale) locale = '<!--#echo var="locale"-->';
+
+        djConfig.locale = locale;
+
     </script>
 
     <script type="text/javascript" src='/js/dojo/dojo/dojo.js'></script>
@@ -51,4 +53,6 @@
         dojo.require("dojo.date.locale");
         dojo.require("dojo.date.stamp");
         dojo.require("dojo.parser");
+        dojo.require("openils.I18N");
+        dojo.require("dijit.form.FilteringSelect");
     </script>

Modified: branches/acq-experiment/Open-ILS/xul/staff_client/server/cat/copy_browser.js
===================================================================
--- branches/acq-experiment/Open-ILS/xul/staff_client/server/cat/copy_browser.js	2008-07-31 15:12:19 UTC (rev 10217)
+++ branches/acq-experiment/Open-ILS/xul/staff_client/server/cat/copy_browser.js	2008-07-31 15:45:25 UTC (rev 10218)
@@ -1220,8 +1220,7 @@
 	'on_select_org' : function(org_id,twisty) {
 		var obj = this;
 		var org = obj.data.hash.aou[ org_id ];
-		if (obj.data.hash.aout[ org.ou_type() ].depth() == 0) return; 
-		/* otherwise, we'd show every system in the consortia */
+        if (obj.data.hash.aout[ org.ou_type() ].depth() == 0 && ! get_bool( obj.data.hash.aout[ org.ou_type() ].can_have_vols() ) ) return;
 		var funcs = [];
 		funcs.push( function() { 
 			document.getElementById('cmd_refresh_list').setAttribute('disabled','true'); 
@@ -1340,7 +1339,7 @@
 			}
 
 			if (document.getElementById('show_acns').checked) {
-				if ( obj.data.hash.aout[ org.ou_type() ].depth() != 0 ) {
+                if (! ( obj.data.hash.aout[ org.ou_type() ].depth() == 0 && ! get_bool( obj.data.hash.aout[ org.ou_type() ].can_have_vols() ) )) {
 					node.setAttribute('open','true');
 					setTimeout( function() { obj.on_select_org( org.id() ); }, 0 );
 				}

