[open-ils-commits] r16845 - in trunk: . Open-ILS/src/perlmods/OpenILS/Application (miker)

svn at svn.open-ils.org svn at svn.open-ils.org
Thu Jul 1 15:46:50 EDT 2010


Author: miker
Date: 2010-07-01 15:46:45 -0400 (Thu, 01 Jul 2010)
New Revision: 16845

Modified:
   trunk/
   trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
Log:
remove as many namespace prefixes as I can from the MODS record output


Property changes on: trunk
___________________________________________________________________
Name: bzr:revision-info
   - timestamp: 2010-06-29 14:10:55.191999912 -0400
committer: Mike Rylander <miker at esilibrary.com>
properties: 
	branch-nick: trunk

   + timestamp: 2010-07-01 15:46:44.638000011 -0400
committer: Mike Rylander <miker at esilibrary.com>
properties: 
	branch-nick: trunk

Name: bzr:file-ids
   - Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	3034 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:Open-ILS%2Fsrc%2Fperlmods%2FOpenILS%2FApplication%2FSuperCat.pm
Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm	3165 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:Open-ILS%2Fsrc%2Fperlmods%2FOpenILS%2FWWW%2FSuperCat.pm

   + Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	3034 at dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:Open-ILS%2Fsrc%2Fperlmods%2FOpenILS%2FApplication%2FSuperCat.pm

Name: bzr:revision-id:v4
   - 11741 phasefx at batrepo-20091014063041-ama3i5s87ziqohxo
11742 phasefx at batrepo-20091014063644-pn3a6urkw3uxgr6n
12108 phasefx at batrepo-20091120084700-lavt73oserscgalf
12166 jason at esilibrary.com-20091202233906-g8kh2kh3qmmz66r1
12184 jason at esilibrary.com-20091204161020-0dqezh01c05btffh
12198 jason at esilibrary.com-20091208140008-eofwdbn2u8dxk2kk
12199 jason at esilibrary.com-20091208155412-4qdzy8sgs51vm0yq
12215 jason at esilibrary.com-20091209133642-bp8mb3tc5vpoc1ij
12220 jason at esilibrary.com-20091209143447-i1st1to8ln4hhwyb
12231 jason at esilibrary.com-20091209221438-vv4crqppm8ajj3dr
12804 jason at esilibrary.com-20100324194046-jza2ic2dlpq8txhc
12946 miker at esilibrary.com-20100402183612-8xznj35wfohk7zyu
12955 miker at esilibrary.com-20100403141037-h8d57ryrmkkg9yhb
12971 miker at whirly-20100405202254-aztbsf3p3eey9e8e
12997 miker at esilibrary.com-20100408154146-zodwuxxizwf0y449
13010 miker at miker-msi-20100409021618-5f0ohbg5cgi5pai0
13014 miker at esilibrary.com-20100409135406-mitf09aw1srnps3g
13022 miker at esilibrary.com-20100412144909-fc4bx1n80ac0z8ox
13023 miker at esilibrary.com-20100412145629-92g9jts2k8yqsm38
13152 miker at esilibrary.com-20100503010126-67i6kclipxip27du
13153 miker at esilibrary.com-20100503010322-3ri56680p7bf4o26
13161 miker at esilibrary.com-20100504150623-34h9t5p64cd52swu
13163 miker at esilibrary.com-20100504180646-77rxefvetqkiyo3s
13164 miker at esilibrary.com-20100504182041-0s81n6j3dxb14hrk
13175 miker at esilibrary.com-20100506194925-xg5folqttvehr2np
13306 miker at esilibrary.com-20100601190218-nf7sqyxzgsylm94f
13533 miker at esilibrary.com-20100629181055-xsdvq3z3mhylm0vb

   + 11741 phasefx at batrepo-20091014063041-ama3i5s87ziqohxo
11742 phasefx at batrepo-20091014063644-pn3a6urkw3uxgr6n
12108 phasefx at batrepo-20091120084700-lavt73oserscgalf
12166 jason at esilibrary.com-20091202233906-g8kh2kh3qmmz66r1
12184 jason at esilibrary.com-20091204161020-0dqezh01c05btffh
12198 jason at esilibrary.com-20091208140008-eofwdbn2u8dxk2kk
12199 jason at esilibrary.com-20091208155412-4qdzy8sgs51vm0yq
12215 jason at esilibrary.com-20091209133642-bp8mb3tc5vpoc1ij
12220 jason at esilibrary.com-20091209143447-i1st1to8ln4hhwyb
12231 jason at esilibrary.com-20091209221438-vv4crqppm8ajj3dr
12804 jason at esilibrary.com-20100324194046-jza2ic2dlpq8txhc
12946 miker at esilibrary.com-20100402183612-8xznj35wfohk7zyu
12955 miker at esilibrary.com-20100403141037-h8d57ryrmkkg9yhb
12971 miker at whirly-20100405202254-aztbsf3p3eey9e8e
12997 miker at esilibrary.com-20100408154146-zodwuxxizwf0y449
13010 miker at miker-msi-20100409021618-5f0ohbg5cgi5pai0
13014 miker at esilibrary.com-20100409135406-mitf09aw1srnps3g
13022 miker at esilibrary.com-20100412144909-fc4bx1n80ac0z8ox
13023 miker at esilibrary.com-20100412145629-92g9jts2k8yqsm38
13152 miker at esilibrary.com-20100503010126-67i6kclipxip27du
13153 miker at esilibrary.com-20100503010322-3ri56680p7bf4o26
13161 miker at esilibrary.com-20100504150623-34h9t5p64cd52swu
13163 miker at esilibrary.com-20100504180646-77rxefvetqkiyo3s
13164 miker at esilibrary.com-20100504182041-0s81n6j3dxb14hrk
13175 miker at esilibrary.com-20100506194925-xg5folqttvehr2np
13306 miker at esilibrary.com-20100601190218-nf7sqyxzgsylm94f
13533 miker at esilibrary.com-20100629181055-xsdvq3z3mhylm0vb
13546 miker at esilibrary.com-20100701194644-2jo870hjjdn1mg43

Name: bzr:text-parents
   - Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	svn-v4:dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:16765
Open-ILS/src/perlmods/OpenILS/WWW/SuperCat.pm	svn-v4:dcc99617-32d9-48b4-a31d-7c20da2025e4:trunk:16761

   + Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	miker at esilibrary.com-20100629181055-xsdvq3z3mhylm0vb


Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	2010-07-01 17:05:53 UTC (rev 16844)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/SuperCat.pm	2010-07-01 19:46:45 UTC (rev 16845)
@@ -1668,14 +1668,17 @@
 		$self	->method_lookup('open-ils.supercat.record.mods.retrieve')
 			->run($mr->master_record);
 	my $master_mods = $_parser->parse_string($master)->documentElement;
-	$master_mods->setNamespace( "http://www.loc.gov/mods/", "mods", 1 );
+	$master_mods->setNamespace( "http://www.loc.gov/mods/", "mods" );
+	$master_mods->setNamespace( "http://www.loc.gov/mods/", undef, 1 );
 
 	# ... and a MODS clone to populate, with guts removed.
 	my $mods = $_parser->parse_string($master)->documentElement;
-	$mods->setNamespace('http://www.loc.gov/mods/', undef);
-	$mods->setNamespace( "http://www.loc.gov/mods/", "mods", 1 );
+	$mods->setNamespace( "http://www.loc.gov/mods/", "mods" ); # modsCollection element
+	$mods->setNamespace('http://www.loc.gov/mods/', undef, 1);
 	($mods) = $mods->findnodes('//mods:mods');
+	#$mods->setNamespace( "http://www.loc.gov/mods/", "mods" ); # mods element
 	$mods->removeChildNodes;
+	$mods->setNamespace('http://www.loc.gov/mods/', undef, 1);
 
 	# Add the metarecord ID as a (locally defined) info URI
 	my $recordInfo = $mods
@@ -1702,21 +1705,24 @@
 	my ($title) = $master_mods->findnodes( './mods:titleInfo[not(@type)]' );
 	
 	if ($title) {
-		$title->setNamespace( "http://www.loc.gov/mods/", "mods", 1 );
+		$title->setNamespace( "http://www.loc.gov/mods/", "mods" );
+		$title->setNamespace( "http://www.loc.gov/mods/", undef, 1 );
 		$title = $mods->ownerDocument->importNode($title);
 		$mods->appendChild($title);
 	}
 
 	my ($author) = $master_mods->findnodes( './mods:name[mods:role/mods:text[text()="creator"]]' );
 	if ($author) {
-		$author->setNamespace( "http://www.loc.gov/mods/", "mods", 1 );
+		$author->setNamespace( "http://www.loc.gov/mods/", "mods" );
+		$author->setNamespace( "http://www.loc.gov/mods/", undef, 1 );
 		$author = $mods->ownerDocument->importNode($author);
 		$mods->appendChild($author);
 	}
 
 	my ($isbn) = $master_mods->findnodes( './mods:identifier[@type="isbn"]' );
 	if ($isbn) {
-		$isbn->setNamespace( "http://www.loc.gov/mods/", "mods", 1 );
+		$isbn->setNamespace( "http://www.loc.gov/mods/", "mods" );
+		$isbn->setNamespace( "http://www.loc.gov/mods/", undef, 1 );
 		$isbn = $mods->ownerDocument->importNode($isbn);
 		$mods->appendChild($isbn);
 	}
@@ -1730,11 +1736,13 @@
 				->run($map->source);
 
 		my $part_mods = $_parser->parse_string($rec);
-		$part_mods->documentElement->setNamespace( "http://www.loc.gov/mods/", "mods", 1 );
+		$part_mods->documentElement->setNamespace( "http://www.loc.gov/mods/", "mods" );
+		$part_mods->documentElement->setNamespace( "http://www.loc.gov/mods/", undef, 1 );
 		($part_mods) = $part_mods->findnodes('//mods:mods');
 
 		for my $node ( ($part_mods->findnodes( './mods:subject' )) ) {
-			$node->setNamespace( "http://www.loc.gov/mods/", "mods", 1 );
+			$node->setNamespace( "http://www.loc.gov/mods/", "mods" );
+			$node->setNamespace( "http://www.loc.gov/mods/", undef, 1 );
 			$node = $mods->ownerDocument->importNode($node);
 			$mods->appendChild( $node );
 		}
@@ -1771,12 +1779,14 @@
 		$relatedItem->appendChild( $subRecordInfo );
 
 		my ($tor) = $part_mods->findnodes( './mods:typeOfResource' );
-		$tor->setNamespace( "http://www.loc.gov/mods/", "mods", 1 ) if ($tor);
+		$tor->setNamespace( "http://www.loc.gov/mods/", "mods" );
+		$tor->setNamespace( "http://www.loc.gov/mods/", undef, 1 ) if ($tor);
 		$tor = $mods->ownerDocument->importNode($tor) if ($tor);
 		$relatedItem->appendChild($tor) if ($tor);
 
 		if ( my ($part_isbn) = $part_mods->findnodes( './mods:identifier[@type="isbn"]' ) ) {
-			$part_isbn->setNamespace( "http://www.loc.gov/mods/", "mods", 1 );
+			$part_isbn->setNamespace( "http://www.loc.gov/mods/", "mods" );
+			$part_isbn->setNamespace( "http://www.loc.gov/mods/", undef, 1 );
 			$part_isbn = $mods->ownerDocument->importNode($part_isbn);
 			$relatedItem->appendChild( $part_isbn );
 



More information about the open-ils-commits mailing list