[open-ils-commits] r9397 - in branches/acq-experiment: . Open-ILS/src/perlmods/OpenILS/Application/Search Open-ILS/web/js/dojo/openils

[svn at svn.open-ils.org]

Author: erickson
Date: 2008-04-21 12:54:46 -0400 (Mon, 21 Apr 2008)
New Revision: 9397

Added:
   branches/acq-experiment/Open-ILS/web/js/dojo/openils/widget/
Modified:
   branches/acq-experiment/
   branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
Log:
Merged revisions 9395-9396 via svnmerge from 
svn://svn.open-ils.org/ILS/trunk

........
  r9395 | erickson | 2008-04-21 11:42:10 -0400 (Mon, 21 Apr 2008) | 1 line
  
  added support for for truncation attribute to z39 queries.  Thanks, James!
........
  r9396 | erickson | 2008-04-21 12:51:44 -0400 (Mon, 21 Apr 2008) | 1 line
  
  added widget directory and new org unit filtering select widget
........



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

Modified: branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm
===================================================================
--- branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm	2008-04-21 16:51:44 UTC (rev 9396)
+++ branches/acq-experiment/Open-ILS/src/perlmods/OpenILS/Application/Search/Z3950.pm	2008-04-21 16:54:46 UTC (rev 9397)
@@ -329,8 +329,11 @@
 	for( keys %$hash ) {
 		next unless ( exists $services{$service}->{attrs}->{$_} );
 		$str .= '@attr 1=' . $services{$service}->{attrs}->{$_}->{code} . # add the use attribute
-			' @attr 4=' . $services{$service}->{attrs}->{$_}->{format} . # add the structure attribute
-			" \"" . $$hash{$_} . "\" "; # add the search term
+			' @attr 4=' . $services{$service}->{attrs}->{$_}->{format}; # add the structure attribute
+		if (exists $services{$service}->{attrs}->{$_}->{truncation}){
+			$str .= ' @attr 5=' . $services{$service}->{attrs}->{$_}->{truncation};
+		}
+		$str .= " \"" . $$hash{$_} . "\" "; # add the search term
 	}
 	return $str;
 }

Copied: branches/acq-experiment/Open-ILS/web/js/dojo/openils/widget (from rev 9396, trunk/Open-ILS/web/js/dojo/openils/widget)