X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=index%2Fzrpn.c;h=36d5c3d42c5f116bc228711f8ce885cda942373b;hb=df117f4652b6999cf689cf5e2e65f8d8541ab4b0;hp=4e1acd9e758fbfca21de02ba6584430385c0ce54;hpb=eb2b742588ce07fb4516bbca22c93b938b13e433;p=idzebra-moved-to-github.git

diff --git a/index/zrpn.c b/index/zrpn.c
index 4e1acd9..36d5c3d 100644
--- a/index/zrpn.c
+++ b/index/zrpn.c
@@ -1,10 +1,21 @@
 /*
- * Copyright (C) 1995-1999, Index Data
+ * Copyright (C) 1995-2000, Index Data
  * All rights reserved.
  * Sebastian Hammer, Adam Dickmeiss
  *
  * $Log: zrpn.c,v $
- * Revision 1.102  2000-03-15 15:00:31  adam
+ * Revision 1.105  2000-11-08 13:46:59  adam
+ * Fixed scan: server could break if bad attribute/database was selected.
+ * Work on remote update.
+ *
+ * Revision 1.104  2000/04/05 09:49:35  adam
+ * On Unix, zebra/z'mbol uses automake.
+ *
+ * Revision 1.103  2000/03/20 19:08:36  adam
+ * Added remote record import using Z39.50 extended services and Segment
+ * Requests.
+ *
+ * Revision 1.102  2000/03/15 15:00:31  adam
  * First work on threaded version.
  *
  * Revision 1.101  2000/03/02 14:35:03  adam
@@ -1557,7 +1568,7 @@ static RSET rpn_prox (ZebraHandle zh, RSET *rset, int rset_no,
     }
     for (i = 0; i<rset_no; i++)
     {
-	if (rset[i])
+	if (rsfd[i])
 	    rset_close (rset[i], rsfd[i]);
 	xfree (buf[i]);
     }
@@ -2487,6 +2498,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
     if (zebra_maps_attr (zh->service->zebra_maps, zapt, &reg_id, &search_type,
 			 &rank_type, &complete_flag, &sort_flag))
     {
+	*num_entries = 0;
 	zh->errCode = 113;
 	return ;
     }
@@ -2514,6 +2526,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
         {
             zh->errString = basenames[base_no];
 	    zh->errCode = 109; /* Database unavailable */
+	    *num_entries = 0;
 	    return;
         }
         for (local_attr = attp.local_attributes; local_attr && ord_no < 32;
@@ -2529,6 +2542,7 @@ void rpn_scan (ZebraHandle zh, ODR stream, Z_AttributesPlusTerm *zapt,
     }
     if (ord_no == 0)
     {
+	*num_entries = 0;
         zh->errCode = 113;
 	return;
     }