Koha moved marcxml column

diff --git a/compact.xsl b/compact.xsl
index 7786122..695de3c 100644 (file)
--- a/compact.xsl
+++ b/compact.xsl
@@ -803,6 +803,7 @@
     
     <xsl:if test="marc:datafield[@tag=024]">
         <xsl:for-each select="marc:datafield[@tag=024]">
+       <a name="col-4"/>
        <a><xsl:attribute name="href">
             <xsl:if test="marc:subfield[@code='2']">
                <xsl:text>http://dx.doi.org/</xsl:text>
@@ -823,7 +824,7 @@
 
        <xsl:if test="marc:datafield[@tag=856]">
                        <br/>
-                       <a name="col-4"/>
+                       <a name="col-5"/>
          <span class="results_summary">
                             <xsl:for-each select="marc:datafield[@tag=856]">
                             <xsl:variable name="SubqText"><xsl:value-of select="marc:subfield[@code='q']"/></xsl:variable>

diff --git a/html.pl b/html.pl
index f23e38b..3bd0cf2 100755 (executable)
--- a/html.pl
+++ b/html.pl
@@ -621,7 +621,7 @@ sub department_html {
                foreach my $bib_num ( @biblionumber ) {
                        my @li = li_biblio( $bib_num );
                        my $li_html = join('', @li);
-                       $li_html =~ s{<a name="col-\d+"></a>}{}gs;
+                       $li_html =~ s{<a name="(col-\d+)"/a>}{<!-- $1 -->}gs;
                        print $fh $li_html;
 
                        next unless $csv_fh;
@@ -629,8 +629,10 @@ sub department_html {
                        my $year = $li[1];
                        my @html;
                        foreach ( split(/<a name="col-/, $li[4]) ) {
-                               if ( s{(\d+)"></a>}{} ) {
-                                       $html[$1] = $_;
+                               if ( s{^(\d+)"></a>}{} ) {
+                                       my $nr = $1;
+                                       s{\s+}{ }gs;
+                                       $html[$nr] = $_;
                                } else {
                                        warn "SKIPPED: Can't find col in [$_] from $li[4]" unless m/^<[^>]+>$/;
                                }

diff --git a/run.sh b/run.sh
index bd179bf..5ef1fae 100755 (executable)
--- a/run.sh
+++ b/run.sh
@@ -1,5 +1,5 @@
 #!/bin/sh -e
 
 cd /srv/koha-bibliografija
-LC_COLLATE=hr_HR.utf8 KOHA_CONF=/etc/koha/sites/ffzg/koha-conf.xml ./html.pl > /tmp/koha-bibliografija.log
+( LC_COLLATE=hr_HR.utf8 KOHA_CONF=/etc/koha/sites/ffzg/koha-conf.xml ./html.pl 2>&1 ) > /dev/shm/koha-bibliografija.log