From e80ec2bf42c9d6bf8502e626251e4253d2c45569 Mon Sep 17 00:00:00 2001
From: olwen <olwen>
Date: Thu, 30 Dec 1999 21:40:31 +0000
Subject: [PATCH] Changes to reserves

---
 C4/Interface/ReserveentCDK.pm | 22 +++++++++++++++-------
 C4/Reserves.pm                | 10 +++++-----
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/C4/Interface/ReserveentCDK.pm b/C4/Interface/ReserveentCDK.pm
index 54221b5..0ff16e6 100755
--- a/C4/Interface/ReserveentCDK.pm
+++ b/C4/Interface/ReserveentCDK.pm
@@ -125,18 +125,26 @@ sub MakeReserveScreen {
   $bookpanel->draw();
   my $branchlist =  new Cdk::Radio('Title'=>"Collection Branch",
      'List'=>\@$branches,
-     'Xpos'=>"2",'Ypos'=>"7",'Width'=>"23",'Height'=>"17");
+     'Xpos'=>"20",'Ypos'=>"5",'Width'=>"18",'Height'=>"6");
   $branchlist->draw();	    
   my $i = 0;
-  while ($i < 4) {
-    $branchlist->inject('Input'=>"KEY_DOWN");
-    $i++;
+  my $brcnt = @$branches;
+  my $brdef = 0;
+  while (($brdef == 0) && ($i < $brcnt)) {
+    my $brcode = substr(@$branches[$i],0,2);
+    my $brtest = fmtstr($env,$env->{'branchcode'},"L2");
+    if ($brcode eq $brtest) {
+      $brdef = 1
+    } else {  
+      $branchlist->inject('Input'=>"KEY_DOWN");
+      $i++;
+    }  
   }  
   $branchlist->inject('Input'=>" ");
   my @constraintlist = ("Any item","Only Selected","Except Selected");
   my $constrainttype = new Cdk::Radio('Title'=>"Reserve Constraints",
      'List'=>\@constraintlist,
-     'Xpos'=>"54",'Ypos'=>"4",'Width'=>"17",'Height'=>"6");
+     'Xpos'=>"54",'Ypos'=>"5",'Width'=>"17",'Height'=>"6");
   $constrainttype->draw();
   my $numbit   = @$bitems;
   my @itemarr;
@@ -157,9 +165,9 @@ sub MakeReserveScreen {
   my @sel = ("Y ","N ");
   my $itemlist = new Cdk::Selection('Title'=>"Items Held",
      'List'=>\@itemarr,'Choices'=>\@sel,
-     'Xpos'=>"36",'Ypos'=>"9",'Width'=>"40",'Height'=>"15");
+     'Xpos'=>"1",'Ypos'=>"12",'Width'=>"70",'Height'=>"8");
   $itemlist->draw();
-  my $borrowerentry = new Cdk::Entry('Label'=>"Borrower:  ",
+  my $borrowerentry = new Cdk::Entry('Label'=>"",'Title'=>"Borrower",
      'Max'=>"11",'Width'=>"11",
      'Xpos'=>"2",'Ypos'=>"5",
      'Type'=>"UMIXED");
diff --git a/C4/Reserves.pm b/C4/Reserves.pm
index 9ebfcf1..af9404c 100755
--- a/C4/Reserves.pm
+++ b/C4/Reserves.pm
@@ -98,7 +98,7 @@ sub EnterReserves{
     if ($no_ents > 0) {
       if ($no_ents == 1) {
         my @ents = split("\t",@results[0]);
-        $biblionumber  = @ents[0];       
+        $biblionumber  = @ents[2];       
       } else {  
         my %biblio_xref;
         my @bibtitles;
@@ -107,10 +107,10 @@ sub EnterReserves{
         while ($i < $no_ents) {
           my @ents = split("\t",@results[$i]);
           $line = fmtstr($env,@ents[1],"L70");
-	  my $auth = substr(@ents[2],0,30);
+	  my $auth = substr(@ents[0],0,30);
 	  substr($line,(70-length($auth)-2),length($auth)+2) = "  ".$auth;
           @bibtitles[$i]=$line;	 
-          $biblio_xref{$line}=@ents[0];
+          $biblio_xref{$line}=@ents[2];
           $i++;
         }
         my $title = titlepanel($env,"Reserves","Select Title");
@@ -129,9 +129,9 @@ sub EnterReserves{
       if ($biblionumber eq "") {
         error_msg($env,"No items found");   
       } else {
-        debug_msg($env,"getting items $biblionumber");	
+        #debug_msg($env,"getting items $biblionumber");	
         my @items = GetItems($env,$biblionumber);
-        debug_msg($env,"got items ");
+        #debug_msg($env,"got items ");
 	 
 	my $cnt_it = @items;
 	my $dbh = &C4Connect;