X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=admin%2Fcheckmarc.pl;h=c11093543e1b63a7f06bbf69729018accd1d7957;hb=d4260af339b74b597e96b5223e5ee8d88de5925d;hp=2283f20fbfbb927c2966c7c64e817dc16e77e50f;hpb=acfd4dd20b323d9c736ea08756a8dfac6bd03d29;p=koha.git

diff --git a/admin/checkmarc.pl b/admin/checkmarc.pl
index 2283f20fbf..c11093543e 100755
--- a/admin/checkmarc.pl
+++ b/admin/checkmarc.pl
@@ -14,9 +14,9 @@
 # WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
 # A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along with
-# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
-# Suite 330, Boston, MA  02111-1307 USA
+# You should have received a copy of the GNU General Public License along
+# with Koha; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 use strict;
 use C4::Output;
@@ -42,27 +42,45 @@ my $total = 0;
 # checks itemnum field
 my $sth = $dbh->prepare("select tab from marc_subfield_structure where kohafield=\"items.itemnumber\"");
 $sth->execute;
-my ($res) = $sth->fetchrow;
-if ($res==-1) {
-	$template->param(itemnum => 0);
-} else {
-	$template->param(itemnum => 1);
-	$total++;
+while (my ($res) = $sth->fetchrow) {
+    if ($res==-1) {
+	    $template->param(itemnum => 0);
+    } else {
+	    $template->param(itemnum => 1);
+	    $total++;
+        last;
+    }
 }
 
 # checks biblio.biblionumber and biblioitem.biblioitemnumber (same tag and tab=-1)
-$sth = $dbh->prepare("select tagfield,tab from marc_subfield_structure where kohafield=\"biblio.biblionumber\"");
-$sth->execute;
-my $tab;
-($res,$tab) = $sth->fetchrow;
-$sth = $dbh->prepare("select tagfield,tab from marc_subfield_structure where kohafield=\"biblioitems.biblioitemnumber\"");
+$sth = $dbh->prepare("select tagfield,tab,frameworkcode from marc_subfield_structure where kohafield=\"biblio.biblionumber\"");
 $sth->execute;
-my ($res2,$tab2) = $sth->fetchrow;
-if ($res && $res2 && $tab==-1 && $tab2==-1) {
-	$template->param(biblionumber => 0);
-} else {
-	$template->param(biblionumber => 1);
-	$total++;
+my $first = 1;
+my $bibliotag = '';
+while (my ($res,$tab,$frameworkcode) = $sth->fetchrow) {
+    if ($first) {
+        $bibliotag = $res;
+        $first = 0;
+    } else {
+        if ($bibliotag != $res) {
+	        $template->param(biblionumber => 1);
+	        $total++;
+            last;
+        }
+    }
+    my $sth2 = $dbh->prepare("SELECT tagfield,tab 
+                              FROM marc_subfield_structure 
+                              WHERE kohafield=\"biblioitems.biblioitemnumber\"
+                              AND frameworkcode = ? ");
+    $sth2->execute($frameworkcode);
+    my ($res2,$tab2) = $sth2->fetchrow;
+    if ($res && $res2 && $tab==-1 && $tab2==-1) {
+	    $template->param(biblionumber => 0);
+    } else {
+	    $template->param(biblionumber => 1);
+	    $total++;
+        last;
+    }
 }
 
 # checks all item fields are in the same tag and in tab 10
@@ -70,6 +88,9 @@ if ($res && $res2 && $tab==-1 && $tab2==-1) {
 $sth = $dbh->prepare("select tagfield,tab,kohafield from marc_subfield_structure where kohafield like \"items.%\" and tab >=0");
 $sth->execute;
 my $field;
+my $res;
+my $res2;
+my $tab;
 ($res,$res2,$field) = $sth->fetchrow;
 my $tagfield = $res;
 $tab = $res2;
@@ -115,33 +136,39 @@ if ($totaltags > 1) {
 # checks biblioitems.itemtype must be mapped and use authorised_value=itemtype
 $sth = $dbh->prepare("select tagfield,tab,authorised_value from marc_subfield_structure where kohafield = \"biblioitems.itemtype\"");
 $sth->execute;
-($res,$res2,$field) = $sth->fetchrow;
-if ($res && $res2>=0 && $field eq "itemtypes") {
-	$template->param(itemtype => 0);
-} else {
-	$template->param(itemtype => 1);
-	$total++;
+while (($res,$res2,$field) = $sth->fetchrow) {
+    if ($res && $res2>=0 && $field eq "itemtypes") {
+	    $template->param(itemtype => 0);
+    } else {
+	    $template->param(itemtype => 1);
+	    $total++;
+        last;
+    }
 }
 
 # checks items.homebranch must be mapped and use authorised_value=branches
 $sth = $dbh->prepare("select tagfield,tab,authorised_value from marc_subfield_structure where kohafield = \"items.homebranch\"");
 $sth->execute;
-($res,$res2,$field) = $sth->fetchrow;
-if ($res && $res2 eq 10 && $field eq "branches") {
-	$template->param(branch => 0);
-} else {
-	$template->param(branch => 1);
-	$total++;
+while (($res,$res2,$field) = $sth->fetchrow) {
+    if ($res && $res2 eq 10 && $field eq "branches") {
+	    $template->param(branch => 0);
+    } else {
+	    $template->param(branch => 1);
+	    $total++;
+        last;
+    }
 }
+
 # checks items.homebranch must be mapped and use authorised_value=branches
 $sth = $dbh->prepare("select tagfield,tab,authorised_value from marc_subfield_structure where kohafield = \"items.holdingbranch\"");
 $sth->execute;
-($res,$res2,$field) = $sth->fetchrow;
-if ($res && $res2 eq 10 && $field eq "branches") {
-	$template->param(holdingbranch => 0);
-} else {
-	$template->param(holdingbranch => 1);
-	$total++;
+while (($res,$res2,$field) = $sth->fetchrow) {
+    if ($res && $res2 eq 10 && $field eq "branches") {
+	    $template->param(holdingbranch => 0);
+    } else {
+	    $template->param(holdingbranch => 1);
+	    $total++;
+    }
 }
 
 # checks that itemtypes & branches tables are not empty
@@ -181,6 +208,41 @@ if ($res) {
 	$total++;
 }
 
+# verify that all of a field's subfields (except the ones explicitly ignored)
+# are in the same tab
+$sth = $dbh->prepare("SELECT tagfield, frameworkcode, frameworktext, GROUP_CONCAT(DISTINCT tab) AS tabs
+                      FROM marc_subfield_structure
+                      LEFT JOIN biblio_framework USING (frameworkcode)
+                      WHERE tab != -1
+                      GROUP BY tagfield, frameworkcode, frameworktext
+                      HAVING COUNT(DISTINCT tab) > 1");
+$sth->execute;
+my $inconsistent_tabs = $sth->fetchall_arrayref({});
+if (scalar(@$inconsistent_tabs) > 0) {
+    $total++;
+    $template->param(inconsistent_tabs => 1);
+    $template->param(tab_info => $inconsistent_tabs);
+}
+
+# verify that authtypecodes used in the framework 
+# are defined in auth_types
+$sth = $dbh->prepare("SELECT frameworkcode, frameworktext, tagfield, tagsubfield, authtypecode
+                      FROM marc_subfield_structure
+                      LEFT JOIN biblio_framework USING (frameworkcode)
+                      WHERE authtypecode IS NOT NULL
+                      AND authtypecode <> ''
+                      AND tab > '-1'
+                      AND authtypecode NOT IN (SELECT authtypecode FROM auth_types)
+                      ORDER BY frameworkcode, tagfield, tagsubfield");
+$sth->execute;
+my $invalid_authtypecodes = $sth->fetchall_arrayref({});
+if (scalar(@$invalid_authtypecodes) > 0) {
+    $total++;
+    $template->param(invalid_authtypecodes => 1);
+    $template->param(authtypecode_info => $invalid_authtypecodes);
+}
+
 $template->param(total => $total,
 		);
+
 output_html_with_http_headers $input, $cookie, $template->output;