Changeset 768

Timestamp:

01/06/10 19:40:15 (2 months ago)

Author:

PavelVinogradov

Message:

Remove analog parser from service code

Files:

• branches/1.1.x/samsdaemon.c (modified) (7 diffs)

branches/1.1.x/samsdaemon.c

@@ -2271 +2271 @@
     printf("    SQUID log parser... ");
   sams_step=1;
+
+/* 
   sprintf(&temp[0],"%s",row[6]);
   if(strcmp(row[6],"analog")==0)
@@ -2278 +2280 @@
          printf("permanent\n");
     }
-  sprintf(&temp[0],"%s",row[6]);
+*/    
+  sprintf(&temp[0],"%s",row[6]);  
   if(strcmp(&temp[0],"diskret")==0)
     {
@@ -2286 +2289 @@
          printf("diskret\n");
     }
-
+  else
+    {
+      printf("SAMS 1.1.n don't support analog parser. Please use dickret parser!");
+      exit (1);
+    }
 
   if(DEBUG==1)
@@ -2638 +2645 @@
 
 
+/* SAMS 1.1.x don't support analog parser
   if(ANALOG==1)  
     {
@@ -2648 +2656 @@
        system(&str[0]);
     }
+*/
+
   sams_clr_month=t->tm_mon+1;
   sams_clr_day=t->tm_mday;
@@ -3015 +3025 @@
                     t=localtime(&tt);
 
+                    /* SAMS 1.1.x don't support analog parser
                     if(ANALOG==1)  
                       {
@@ -3026 +3037 @@
                          AddLog(conn2,0,"samsdaemon","Restarting samsf");
                       }
+                    */
 /* swap.state*/
 //  sprintf(&str[0],"%s/swap.state",conf.cachedir);