[sword-svn] r314 - trunk/modules/crossreferences

[refdoc at crosswire.org]

Author: refdoc
Date: 2010-11-15 15:36:20 -0700 (Mon, 15 Nov 2010)
New Revision: 314

Modified:
   trunk/modules/crossreferences/xreffix.pl
Log:
corrected loop error


Modified: trunk/modules/crossreferences/xreffix.pl
===================================================================
--- trunk/modules/crossreferences/xreffix.pl	2010-11-06 00:12:39 UTC (rev 313)
+++ trunk/modules/crossreferences/xreffix.pl	2010-11-15 22:36:20 UTC (rev 314)
@@ -118,12 +118,9 @@
     
     s/<reference>(.*?)<\/reference>/createReference($1,$c_book,$c_chapter,$c_verse)/eg;
 
+    s/<note\ type=\"crossReference\">(.*?)<\/note>/"<note n=\"".note_index()."\" osisID=\"$c_book.$c_chapter.$c_verse!crossReference.".note_index()."\" osisRef=\"$c_book.$c_chapter.$c_verse\" type=\"crossReference\">".$1."<\/note>"/eg;   
     
     }
-
-foreach (@data) {
-    s/<note\ type=\"crossReference\">(.*?)<\/note>/"<note n=\"".note_index()."\" osisID=\"$c_book.$c_chapter.$c_verse!crossReference.".note_index()."\" osisRef=\"$c_book.$c_chapter.$c_verse\" type=\"crossReference\">".$1."<\/note>"/eg;   
-    }
     
 print (OUTF @data);    
 close OUTF;
@@ -149,8 +146,9 @@
     $ref	=~ s/$sep_cv/:/g;
     $ref	=~ s/;$ind_v\ /;\ /g;
     $ref	=~ s/^$ind_v//;
-    # $ref	=~ s/$sep_l/,/g;
-    $ref	=~ s/\./,/g;
+    $ref	=~ s/$sep_l/,/g;
+    
+    
     # Sometimes xrefs have prose content apart from the actual references. 
     
     my @refs = split(/$fill_start/,$ref);
@@ -203,9 +201,9 @@
     $ind_v	= 'V\.';		# indicator for single verse - unfortunatly this will get lost in the conversion.
     $sep_l	= '\.';		# separator for list of chapters or verses
 
-    $fill_start 	="vg"; 	# indicators for "compare"
-    $fill_end	="l";	# /	-> reads as "vgl." 
-    $fill		= "vgl\."#/
+    $fill_start 	=";vg"; 	# indicators for "compare"
+    $fill_end		="l";	# /	-> reads as "vgl." 
+    $fill		= 'vgl.'#/
 
 }