Changeset 1355 for trunk/gsdl/src/recpt/zparse.tab.c

Timestamp:

2000-08-04T12:32:20+12:00 (24 years ago)

Author:

jrm21

Message:

Fixed up parsing of z39.50 config file, so that errors go to file instead
of stderr, which screws up the cgi headers and page...
Errors goes to etc/recpt/z3950err.txt

File:

• trunk/gsdl/src/recpt/zparse.tab.c (modified) (13 diffs)

trunk/gsdl/src/recpt/zparse.tab.c

@@ -70 +70 @@
 
 /* defined in z3950proto.cpp */
-extern struct z3950cfg *zservers_cfg_file;
+struct z3950cfg *zserver_list=NULL;
 
 int yylex(void);
@@ -157 +157 @@
 #if YYDEBUG != 0
 static const short yyrline[] = { 0,
-    82,    85,    86,    88,    89,    91,   108,   111,   112,   117,
-   118,   121,   122,   125,   126,   127,   132,   134,   135,   137,
-   139,   142,   153,   175,   183,   191,   193,   194,   196,   197
+    82,    85,    86,    88,    89,    91,   111,   115,   116,   121,
+   122,   125,   126,   129,   130,   131,   136,   138,   139,   141,
+   143,   146,   157,   179,   187,   195,   197,   198,   200,   201
 };
 #endif
@@ -787 +787 @@
 case 3:
 #line 86 "zparse.y"
-{fprintf(stderr,"No version - not GSDL config file?\n");exit(1);;
+{fprintf(stderr,"No version - not GSDL config file?\n");return(1);;
     break;}
 case 4:
@@ -800 +800 @@
              else {
                if((yyval.cfg=malloc(sizeof(struct z3950cfg)))==NULL)
-             fprintf(stderr,"malloc failed\n");
+             {
+               fprintf(stderr,"malloc failed\n");
+               return(1);
+             }
                yyval.cfg->shortname=yyvsp[-7].string;
                yyval.cfg->hostname=yyvsp[-6].string;
@@ -813 +816 @@
     break;}
 case 7:
-#line 108 "zparse.y"
-{yyval.cfg=NULL;printf("discarding zserver\n");;
+#line 111 "zparse.y"
+{yyval.cfg=NULL;
+          fprintf(stderr,"discarding zserver (line %d)\n",lineno);;
     break;}
 case 8:
-#line 111 "zparse.y"
+#line 115 "zparse.y"
 {;;
     break;}
 case 9:
-#line 112 "zparse.y"
+#line 116 "zparse.y"
 {errormsg("Database name needs to be followed by a short "
               "descriptive name (enclosed in \" marks)");
@@ -828 +832 @@
     break;}
 case 10:
-#line 117 "zparse.y"
+#line 121 "zparse.y"
 {yyval.number=atoi(yyvsp[0].string);;
     break;}
 case 11:
-#line 118 "zparse.y"
+#line 122 "zparse.y"
 {yyval.number=210;;
     break;}
 case 12:
-#line 121 "zparse.y"
+#line 125 "zparse.y"
 {yyval.string=yyvsp[0].string;;
     break;}
 case 13:
-#line 122 "zparse.y"
+#line 126 "zparse.y"
 {yyval.string=yyvsp[0].string;
                   errormsg("Icon must be enclosed in quotes");
@@ -846 +850 @@
     break;}
 case 14:
-#line 125 "zparse.y"
+#line 129 "zparse.y"
 {yyval.string=NULL;;
     break;}
 case 15:
-#line 126 "zparse.y"
+#line 130 "zparse.y"
 {yyval.string=yyvsp[0].string;;
     break;}
 case 16:
-#line 127 "zparse.y"
+#line 131 "zparse.y"
 {yyval.string=yyvsp[0].string;
           /* this is because of the ':' */
@@ -862 +866 @@
     break;}
 case 17:
-#line 132 "zparse.y"
+#line 136 "zparse.y"
 {yyval.string=NULL;;
     break;}
 case 18:
-#line 134 "zparse.y"
+#line 138 "zparse.y"
 {defLanguage=0;;
     break;}
 case 19:
-#line 135 "zparse.y"
+#line 139 "zparse.y"
 {yyval.about=NULL;;
     break;}
 case 20:
-#line 137 "zparse.y"
+#line 141 "zparse.y"
 {;;
     break;}
 case 21:
-#line 139 "zparse.y"
+#line 143 "zparse.y"
 {yyval.about=yyvsp[0].about;yyvsp[0].about->next=yyvsp[-1].about;;
     break;}
 case 22:
-#line 143 "zparse.y"
+#line 147 "zparse.y"
 {
                    if((yyval.about=malloc(sizeof(struct z3950aboutlist)))
                   ==NULL) {
                  fprintf(stderr,"Malloc failed\n");
-                 exit(1);
+                 return(1);
                    }
                    yyval.about->lang=yyvsp[-1].string;
@@ -895 +899 @@
     break;}
 case 23:
-#line 154 "zparse.y"
+#line 158 "zparse.y"
 {
                    if (defLanguage)
@@ -906 +910 @@
                   ==NULL) {
                  fprintf(stderr,"Malloc failed\n");
-                 exit(1);
+                 return(1);
                    }
                    yyval.about->lang=NULL; /* default lang... */
@@ -914 +918 @@
     break;}
 case 24:
-#line 176 "zparse.y"
+#line 180 "zparse.y"
 {
                    yyval.string=malloc(strlen(yyvsp[-2].string)+strlen(yyvsp[0].string)+1);
@@ -924 +928 @@
     break;}
 case 25:
-#line 183 "zparse.y"
+#line 187 "zparse.y"
 {;;
     break;}
 case 26:
-#line 191 "zparse.y"
+#line 195 "zparse.y"
 {errormsg("missing language");;
     break;}
 case 27:
-#line 193 "zparse.y"
+#line 197 "zparse.y"
 {;;
     break;}
 case 28:
-#line 194 "zparse.y"
+#line 198 "zparse.y"
 {;;
     break;}
 case 29:
-#line 196 "zparse.y"
+#line 200 "zparse.y"
 {;;
     break;}
 case 30:
-#line 197 "zparse.y"
+#line 201 "zparse.y"
 {;;
     break;}
@@ -1170 +1174 @@
   return 1;
 }
-#line 200 "zparse.y"
+#line 204 "zparse.y"
 
 /*int strncasecmp (const char *, const char *,size_t);*/