[open-ils-commits] r10025 - in branches/acq-experiment: . Open-ILS/src Open-ILS/src/extras Open-ILS/src/extras/import Open-ILS/src/sql/Pg Open-ILS/web/opac/images/tor Open-ILS/xul/staff_client/chrome/content/OpenILS Open-ILS/xul/staff_client/chrome/content/cat

Mon Jul 14 10:08:08 EDT 2008

Author: erickson
Date: 2008-07-14 10:08:07 -0400 (Mon, 14 Jul 2008)
New Revision: 10025

Removed:
   branches/acq-experiment/Open-ILS/src/extras/import/cleanse-usmarc.sh
   branches/acq-experiment/Open-ILS/src/extras/import/extract-holdings.sh
   branches/acq-experiment/Open-ILS/src/extras/marcdumper/
Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/src/Makefile
   branches/acq-experiment/Open-ILS/src/sql/Pg/950.data.seed-values.sql
   branches/acq-experiment/Open-ILS/web/opac/images/tor/sound recording-musical.jpg
   branches/acq-experiment/Open-ILS/web/opac/images/tor/sound recording-nonmusical.jpg
   branches/acq-experiment/Open-ILS/web/opac/images/tor/sound recording.jpg
   branches/acq-experiment/Open-ILS/web/opac/images/tor/still images.jpg
   branches/acq-experiment/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
   branches/acq-experiment/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
   branches/acq-experiment/install.conf.default
   branches/acq-experiment/install.sh
Log:
Merged revisions 10008-10010,10013,10021,10024 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r10008 | dbs | 2008-07-10 00:04:44 -0400 (Thu, 10 Jul 2008) | 1 line
  
  So long, marcdumper; you served us well, but you have outlived your usefulness.
........
  r10009 | dbs | 2008-07-10 00:12:02 -0400 (Thu, 10 Jul 2008) | 2 lines
  
  Purge references to marcdumper, now that it's gone
........
  r10010 | dbs | 2008-07-10 00:35:46 -0400 (Thu, 10 Jul 2008) | 2 lines
  
  Convert these GIF images into real JPEGs
........
  r10013 | miker | 2008-07-10 09:03:03 -0400 (Thu, 10 Jul 2008) | 1 line
  
  adding DELETE_RECORD to the default permission set
........
  r10021 | phasefx | 2008-07-12 22:09:13 -0400 (Sat, 12 Jul 2008) | 1 line
  
  Mitigates the script/CPU warning with very large offline patron lists.  Still need to make things async and/or broken up to give the UI thread some CPU time in offline.js.
........
  r10024 | phasefx | 2008-07-13 20:35:15 -0400 (Sun, 13 Jul 2008) | 1 line
  
  Reset the MARC View, Holdings Maintenance, and View Holds interfaces on save in the MARC Editor.  We can't reset the OPAC View in the same way without messing up navigation through OPAC events, so need to give that some thought.
........



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

Modified: branches/acq-experiment/Open-ILS/src/Makefile
===================================================================

--- branches/acq-experiment/Open-ILS/src/Makefile	2008-07-14 00:35:15 UTC (rev 10024)
+++ branches/acq-experiment/Open-ILS/src/Makefile	2008-07-14 14:08:07 UTC (rev 10025)
@@ -105,16 +105,6 @@
 	cp support-scripts/offline-blocked-list.pl $(BINDIR) # this should probably be somewhere else
 # -----------------------------------------------------------------------------------
 
-marcdumper:
-	@echo $@
-	make -C extras/marcdumper
-
-marcdumper-install:
-	@echo $@
-	make -C extras/marcdumper install
-
-# -----------------------------------------------------------------------------------
-
 perl-install:
 	@echo $@
 	@echo "Installing Perl modules to $(PERLDIR)"

Deleted: branches/acq-experiment/Open-ILS/src/extras/import/cleanse-usmarc.sh
===================================================================
--- branches/acq-experiment/Open-ILS/src/extras/import/cleanse-usmarc.sh	2008-07-14 00:35:15 UTC (rev 10024)
+++ branches/acq-experiment/Open-ILS/src/extras/import/cleanse-usmarc.sh	2008-07-14 14:08:07 UTC (rev 10025)
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-DUMPER=/home/miker/cvs/ILS/Open-ILS/src/extras/import/../marcdumper/marcdumper
-
-
-$DUMPER -X -f MARC8 -t UTF8 -r '//*[@tag="999"]' $*

Deleted: branches/acq-experiment/Open-ILS/src/extras/import/extract-holdings.sh
===================================================================
--- branches/acq-experiment/Open-ILS/src/extras/import/extract-holdings.sh	2008-07-14 00:35:15 UTC (rev 10024)
+++ branches/acq-experiment/Open-ILS/src/extras/import/extract-holdings.sh	2008-07-14 14:08:07 UTC (rev 10025)
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-DUMPER=/home/miker/cvs/ILS/Open-ILS/src/extras/import/../marcdumper/marcdumper
-
-
-$DUMPER -X -f MARC8 -t UTF8 -r '/*/*/*[(local-name()="datafield" and (@tag!="035" and @tag!="999")) or local-name()!="datafield"]' $*

Modified: branches/acq-experiment/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- branches/acq-experiment/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2008-07-14 00:35:15 UTC (rev 10024)
+++ branches/acq-experiment/Open-ILS/src/sql/Pg/950.data.seed-values.sql	2008-07-14 14:08:07 UTC (rev 10025)
@@ -1048,6 +1048,8 @@
     (175, 'ADMIN_PROVIDER', oils_i18n_gettext('Allow a user to create/view/update/delete a provider')),
     (176, 'MANAGE_PROVIDER', oils_i18n_gettext('Allow a user to view and purchase from a provider')),
     (177, 'VIEW_PICKLIST', oils_i18n_gettext('Allow a user to view another users picklist'));
+INSERT INTO permission.perm_list VALUES 
+    (153, 'DELETE_RECORD', oils_i18n_gettext('Allow a staff member to directly remove a bibliographic record'));
 
 SELECT SETVAL('permission.perm_list_id_seq'::TEXT, (SELECT MAX(id) FROM permission.perm_list));
 

Modified: branches/acq-experiment/Open-ILS/web/opac/images/tor/sound recording-musical.jpg
===================================================================
(Binary files differ)

Modified: branches/acq-experiment/Open-ILS/web/opac/images/tor/sound recording-nonmusical.jpg
===================================================================
(Binary files differ)

Modified: branches/acq-experiment/Open-ILS/web/opac/images/tor/sound recording.jpg
===================================================================
(Binary files differ)

Modified: branches/acq-experiment/Open-ILS/web/opac/images/tor/still images.jpg
===================================================================
(Binary files differ)

Modified: branches/acq-experiment/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js
===================================================================
--- branches/acq-experiment/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js	2008-07-14 00:35:15 UTC (rev 10024)
+++ branches/acq-experiment/Open-ILS/xul/staff_client/chrome/content/OpenILS/data.js	2008-07-14 14:08:07 UTC (rev 10025)
@@ -157,7 +157,7 @@
 			var data_cache=new OpenILS( );
 			for (var i = 0; i < arguments.length; i++) {
 				try {
-					if (arguments[i] != 'hash' && arguments[i] != 'list') this.error.sdump('D_DATA_STASH','stashing ' + arguments[i] + ' : ' + this[arguments[i]] + (typeof this[arguments[i]] == 'object' ? ' = ' + js2JSON(this[arguments[i]]) : '') + '\n');
+					if (arguments[i] != 'hash' && arguments[i] != 'list') this.error.sdump('D_DATA_STASH','stashing ' + arguments[i] + ' : ' + this[arguments[i]] + (typeof this[arguments[i]] == 'object' ? ' = ' + (this[arguments[i]]) : '') + '\n');
 				} catch(F) { alert(F); }
 				data_cache.wrappedJSObject.OpenILS.prototype.data[arguments[i]] = this[arguments[i]];
 			}

Modified: branches/acq-experiment/Open-ILS/xul/staff_client/chrome/content/cat/opac.js
===================================================================
--- branches/acq-experiment/Open-ILS/xul/staff_client/chrome/content/cat/opac.js	2008-07-14 00:35:15 UTC (rev 10024)
+++ branches/acq-experiment/Open-ILS/xul/staff_client/chrome/content/cat/opac.js	2008-07-14 14:08:07 UTC (rev 10025)
@@ -78,6 +78,9 @@
 				'func' : function (new_marcxml) {
 					try {
 						var r = g.network.simple_request('MARC_XML_RECORD_UPDATE', [ ses(), docid, new_marcxml ]);
+                        marc_view_reset = true;
+                        copy_browser_reset = true;
+                        hold_browser_reset = true;
 						if (typeof r.ilsevent != 'undefined') {
 							throw(r);
 						} else {

Modified: branches/acq-experiment/install.conf.default
===================================================================
--- branches/acq-experiment/install.conf.default	2008-07-14 00:35:15 UTC (rev 10024)
+++ branches/acq-experiment/install.conf.default	2008-07-14 14:08:07 UTC (rev 10025)
@@ -21,14 +21,12 @@
 # openils_all			- builds all OpenILS compenents
 # openils_core			- install the Open-ILS perl modules, and core files for running and openils server
 # openils_web			- copies over the javascript and html templates to the web root directory for running the OPAC
-# openils_marcdumper - utility code for converting MARC to MARCXML
 # openils_db			- installs the database schemas 
 # openils_reporter		- installs the base of OpenILS Reporter
 #
 # evergreen_core		- builds core Evergreen components (does not build evergreen_xul_client!)
 # evergreen_xul_client   - client XUL application
 #
-# Build marcdumper only if you need to convert MARC binary files to MARCXML.  
 # If you only want to build the client app, then just build evergreen_xul_client.
 # --------------------------------------------------------------------
 

Modified: branches/acq-experiment/install.sh
===================================================================
--- branches/acq-experiment/install.sh	2008-07-14 00:35:15 UTC (rev 10024)
+++ branches/acq-experiment/install.sh	2008-07-14 14:08:07 UTC (rev 10025)
@@ -164,11 +164,6 @@
 				fi;
 				;;
 
-			"openils_marcdumper" )
-				if building;	then $MAKE -C "$OPENILSDIR" "marcdumper"; fi;
-				if installing; then $MAKE -C "$OPENILSDIR" "marcdumper-install"; fi;
-				;;
-
 			"openils_db" )
 				if installing; then 
 					$MAKE -C "$OPENILSDIR" "storage-bootstrap"; 

