* road to zebra for MARC=OFF

* removing Acquisitions/branches.pm call, as it's now in Koha.pm

diff --git a/acqui.simple/additem-nomarc.pl b/acqui.simple/additem-nomarc.pl
index 73b9c79..e9ede8d 100755 (executable)
--- a/acqui.simple/additem-nomarc.pl
+++ b/acqui.simple/additem-nomarc.pl
@@ -20,6 +20,10 @@
 # Suite 330, Boston, MA  02111-1307 USA
 
 # $Log$
+# Revision 1.7  2005/09/02 14:46:40  tipaul
+# * road to zebra for MARC=OFF
+# * removing Acquisitions/branches.pm call, as it's now in Koha.pm
+#
 # Revision 1.6  2005/08/04 12:12:13  tipaul
 # synch'ing 2.2 and head
 #
@@ -39,8 +43,8 @@
 
 use CGI;
 use strict;
-use C4::Acquisition;
 use C4::Biblio;
+use C4::Koha;
 use C4::Output;
 use HTML::Template;
 use C4::Auth;
@@ -56,89 +60,80 @@ my @biblios;
 my $biblioitemcount;
 my @biblioitems;
 my $branchcount;
-my @branches;
-my %branchnames;
+# my @branches;
+# my %branchnames;
 my $itemcount;
 my @items;
-my $itemtypecount;
-my @itemtypes;
-my %itemtypedescriptions;
 
 if ( !$biblionumber ) {
-    print $input->redirect('addbooks.pl');
+       print $input->redirect('addbooks.pl');
 }
 else {
-
-    ( $bibliocount, @biblios ) = &getbiblio($biblionumber);
-
-    if ( !$bibliocount ) {
-        print $input->redirect('addbooks.pl');
-    }
-    else {
-
-        ( $biblioitemcount, @biblioitems ) =
-          &getbiblioitembybiblionumber($biblionumber);
-        ( $branchcount,   @branches )  = &branches;
-        ( $itemtypecount, @itemtypes ) = &getitemtypes;
-
-        for ( my $i = 0 ; $i < $itemtypecount ; $i++ ) {
-            $itemtypedescriptions{ $itemtypes[$i]->{'itemtype'} } =
-              $itemtypes[$i]->{'description'};
-        }    # for
-
-        for ( my $i = 0 ; $i < $branchcount ; $i++ ) {
-            $branchnames{ $branches[$i]->{'branchcode'} } =
-              $branches[$i]->{'branchname'};
-        }    # for
-
-        #      print $input->header;
-        #      print startpage();
-        #      print startmenu('acquisitions');
-        my $input = new CGI;
-        my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
-            {
-                template_name   => "acqui.simple/additem-nomarc.tmpl",
-                query           => $input,
-                type            => "intranet",
-                authnotrequired => 0,
-                flagsrequired   => { editcatalogue => 1 },
-                debug           => 1,
-            }
-        );
-
-        if ( $error eq "nobarcode" ) {
-            $template->param( NOBARCODE => 1 );
-        }
-        elsif ( $error eq "nobiblioitem" ) {
-            $template->param( NOBIBLIOITEM => 1 );
-        }
-        elsif ( $error eq "barcodeinuse" ) {
-            $template->param( BARCODEINUSE => 1 );
-        }    # elsif
-
-        for ( my $i = 0 ; $i < $biblioitemcount ; $i++ ) {
-            if ( $biblioitems[$i]->{'itemtype'} eq "WEB" ) {
-                $biblioitems[$i]->{'WEB'} = 1;
-
-            }
-            $biblioitems[$i]->{'dewey'} =~ /(\d*\.\d\d)/;
-            $biblioitems[$i]->{'dewey'} = $1;
-            ( $itemcount, @items ) =
-              &getitemsbybiblioitem( $biblioitems[$i]->{'biblioitemnumber'} );
-            $biblioitems[$i]->{'items'} = \@items;
-        }    # for
-        $template->param(
-            BIBNUM    => $biblionumber,
-            AUTHOR    => $biblios[0]->{'author'},
-            TITLE     => $biblios[0]->{'title'},
-            COPYRIGHT => $biblios[0]->{'copyrightdate'},
-            SERIES    => $biblios[0]->{'seriestitle'},
-            NOTES     => $biblios[0]->{'notes'},
-            BIBITEMS  => \@biblioitems,
-            BRANCHES  => \@branches,
-            ITEMTYPES => \@itemtypes,
-
-        );
+       my $input = new CGI;
+       my ( $template, $loggedinuser, $cookie ) = get_template_and_user(
+               {
+                       template_name   => "acqui.simple/additem-nomarc.tmpl",
+                       query           => $input,
+                       type            => "intranet",
+                       authnotrequired => 0,
+                       flagsrequired   => { editcatalogue => 1 },
+                       debug           => 1,
+               }
+       );
+       ( $bibliocount, @biblios ) = &getbiblio($biblionumber);
+
+       if ( !$bibliocount ) {
+               print $input->redirect('addbooks.pl');
+       }
+       else {
+               ( $biblioitemcount, @biblioitems ) = &getbiblioitembybiblionumber($biblionumber);
+               my $branches = getbranches;
+               my @branchloop;
+               foreach my $thisbranch (sort keys %$branches) {
+                       my %row =(value => $thisbranch,
+                                               branchname => $branches->{$thisbranch}->{'branchname'},
+                                       );
+                       push @branchloop, \%row;
+               }
+               my $itemtypes = &getitemtypes;
+               my @itemtypeloop;
+               foreach my $thisitemtype (sort keys %$itemtypes) {
+                       my %row =(value => $thisitemtype,
+                                               description => $itemtypes->{$thisitemtype}->{'description'},
+                                       );
+                       push @itemtypeloop, \%row;
+               }
+               if ( $error eq "nobarcode" ) {
+                       $template->param( NOBARCODE => 1 );
+               }
+               elsif ( $error eq "nobiblioitem" ) {
+                       $template->param( NOBIBLIOITEM => 1 );
+               }
+               elsif ( $error eq "barcodeinuse" ) {
+                       $template->param( BARCODEINUSE => 1 );
+               }    # elsif
+
+               for ( my $i = 0 ; $i < $biblioitemcount ; $i++ ) {
+                       if ( $biblioitems[$i]->{'itemtype'} eq "WEB" ) {
+                               $biblioitems[$i]->{'WEB'} = 1;
+                       }
+                       $biblioitems[$i]->{'dewey'} =~ /(\d*\.\d\d)/;
+                       $biblioitems[$i]->{'dewey'} = $1;
+                       ( $itemcount, @items ) = &getitemsbybiblioitem( $biblioitems[$i]->{'biblioitemnumber'} );
+                       $biblioitems[$i]->{'items'} = \@items;
+               }    # for
+               $template->param(
+                       BIBNUM    => $biblionumber,
+                       AUTHOR    => $biblios[0]->{'author'},
+                       TITLE     => $biblios[0]->{'title'},
+                       COPYRIGHT => $biblios[0]->{'copyrightdate'},
+                       SERIES    => $biblios[0]->{'seriestitle'},
+                       NOTES     => $biblios[0]->{'notes'},
+                       BIBITEMS  => \@biblioitems,
+                       branchloop  => \@branchloop,
+                       itemtypeloop => \@itemtypeloop,
+
+               );
 
         output_html_with_http_headers $input, $cookie, $template->output;
     }    # if

diff --git a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl
index 7bced4d..c9656a5 100644 (file)
--- a/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/acqui.simple/additem-nomarc.tmpl
@@ -47,8 +47,8 @@
                <p>
                        <label>Branch:</label>
                        <select name="homebranch">
-                       <!-- TMPL_LOOP NAME="BRANCHES" -->
-                               <option value="<!-- TMPL_VAR NAME="branchcode" -->"><!-- TMPL_VAR NAME="branchname" --></option>
+                       <!-- TMPL_LOOP name="branchloop" -->
+                               <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="branchname" --></option>
                        <!-- /TMPL_LOOP -->
                        </select>
                </p>
@@ -56,7 +56,7 @@
                <p><label>Notes:</label><textarea name="itemnotes" cols="30" rows="6"></textarea></p>
        </div>
        <div id="bloc25">
-               <h2 class="catalogue">Add to existing group:</h2>
+               <h3 class="catalogue">Add to existing group:</h2>
                <p>
                        <label>Group:</label><select name="biblioitemnumber">
                        <!-- TMPL_LOOP NAME="BIBITEMS" -->
@@ -67,16 +67,14 @@
                        <!-- /TMPL_LOOP -->
                        </select>
                </p>
-               <p><input type="submit" name="existinggroup" value="Add New Item to Existing Group"></p>
-       </div>
-       <div id="bloc25">
-               <h2 class="catalogue">OR Add to a new Group:</h2>
+               <p><input type="submit" name="existinggroup" value="Add New Item to Existing Group" class="button catalogue"></p>
+               <h3 class="catalogue">OR Add to a new Group:</h2>
                <p>
                        <label>Format:</label>
                        <select name="itemtype">
-                               <!-- TMPL_LOOP NAME="ITEMTYPES" -->
-                                       <option value="<!-- TMPL_VAR NAME="itemtype" -->"><!-- TMPL_VAR NAME="description" --></option>
-                               <!-- /TMPL_LOOP -->
+                       <!-- TMPL_LOOP name="itemtypeloop" -->
+                               <option value="<!-- TMPL_VAR name="value" -->" <!-- TMPL_IF name="selected" -->selected<!-- /TMPL_IF -->><!-- TMPL_VAR name="description" --></option>
+                       <!-- /TMPL_LOOP -->
                        </select>
                </p>
                <p><label>ISBN:</label><input name="isbn" size="40"></p>