Subversion Repositories wimsdev

Rev

Rev 18014 | Rev 18032 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 18014 Rev 18020
Line 2222... Line 2222...
2222
  }
2222
  }
2223
  snprintf(nbuf2,sizeof(nbuf2),"%s/%s/sheets/.severity",class_base,c);
2223
  snprintf(nbuf2,sizeof(nbuf2),"%s/%s/sheets/.severity",class_base,c);
2224
  readfile(nbuf2,buf2,MAX_LINELEN);
2224
  readfile(nbuf2,buf2,MAX_LINELEN);
2225
  snprintf(nbuf,sizeof(nbuf),":%s\n%s\n",p,p1); *p=0;
2225
  snprintf(nbuf,sizeof(nbuf),":%s\n%s\n",p,p1); *p=0;
2226
  for (sheet=start; sheet <= stop; ++sheet){
2226
  for (sheet=start; sheet <= stop; ++sheet){
2227
    fnd_line(buf2,sheet+1,buf3);
-
 
2228
    if(!buf3[0]) getdef("bases/sys/define.conf","DF_SEVERITY",buf3);
2227
    if(!buf3[0]) getdef("bases/sys/define.conf","DF_SEVERITY",buf3);
2229
    snprintf(nbuf2,sizeof(nbuf2),"%s/%s/sheets/.sheet%d",class_base,c,sheet);
2228
    snprintf(nbuf2,sizeof(nbuf2),"%s/%s/sheets/.sheet%d",class_base,c,sheet);
2230
    if(readfile(nbuf2,buf,MAX_LINELEN)==NULL) break;
2229
    if(readfile(nbuf2,buf,MAX_LINELEN)==NULL) break;
2231
    p1=strstr(buf,nbuf);
2230
    p1=strstr(buf,nbuf);
2232
    while(p1>buf && *(p1-1)!='\n') p1=strstr(p1+1,nbuf);
2231
    while(p1>buf && *(p1-1)!='\n') p1=strstr(p1+1,nbuf);
Line 2236... Line 2235...
2236
      for(i=1;p2!=NULL && p2<p1;i++) {
2235
      for(i=1;p2!=NULL && p2<p1;i++) {
2237
        p2=strchr(p2+1,':');
2236
        p2=strchr(p2+1,':');
2238
        while(p2>buf && *(p2-1)!='\n') p2=strchr(p2+1,':');
2237
        while(p2>buf && *(p2-1)!='\n') p2=strchr(p2+1,':');
2239
      }
2238
      }
2240
      if(p2==NULL) return;
2239
      if(p2==NULL) return;
-
 
2240
      fnd_line(buf2,sheet+1,buf3);
2241
      snprintf(p,20,"%d/%d,%s",sheet,i,buf3);
2241
      snprintf(p,20,"%d/%d,%s",sheet,i,buf3);
2242
      break;
2242
      break;
2243
    }
2243
    }
2244
  }
2244
  }
2245
}
2245
}