0.8.1-b

[svn/Prometheus-QoS/.git] / prometheus.c

diff --git a/prometheus.c b/prometheus.c
index d93f0d25025dc4304568274944b3d965f81ab20f..aa5eb5f9fe81407a32a8e343d73d0afc731093b9 100644 (file)
--- a/prometheus.c
+++ b/prometheus.c
@@ -33,7 +33,7 @@
 \r
 #include "cll1-0.6.h"\r
 \r
-const char *version = "0.7.9-d"; \r
+const char *version = "0.8.1-b"; \r
 \r
 /* Version numbers: 0.7.9 is development releases ("beta"), 0.8.0 will be "stable" */\r
 /* Debian(RPM) package versions/patchlevels: 0.7.9-2, 0.8.0-1, 0.8.0-2, etc. */\r
@@ -684,61 +684,64 @@ void parse_ip_log(int argc, char **argv)
  }\r
  printf("Analysing traffic for %s %s ...\n",month,year);\r
 \r
- sprintf(str,"%s %s/*.log",ls,log_dir);\r
+ /* sorry... next release of C<<1 header file will include for_path_files(name,path) {  } macro */\r
+ sprintf(str,"%s %s/",ls,log_dir);\r
  shell(str);\r
-\r
- input(str,STRLEN)\r
+ input(str,STRLEN) \r
  {\r
-  ptr=strrchr(str,'\n');\r
-  if(ptr) *ptr='\0';\r
-  printf("Parsing %s ...",str);\r
-  accept_month=0;\r
-  traffic_month=0;\r
-  guaranted = 0;\r
-  parse(str)\r
-  {\r
-   y_ok=m_ok=0;  \r
-   valid_columns(ptr,_,'\t',col) switch(col)\r
+  if(strstr(str,".log"))\r
    {\r
-    case 2: name = ptr;break;\r
-    case 3: traffic = atol(ptr);break;\r
-    /* column number   - was 7, now 10...*/\r
-    case 7:\r
-    case 8:\r
-    case 9:\r
-    case 10: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/\r
-             {\r
-               valid_columns(ptr2,ptr,' ',col2) switch(col2)\r
+    ptr=strrchr(str,'\n');\r
+    if(ptr) *ptr='\0';\r
+    printf("Parsing %s ...",str);\r
+    accept_month=0;\r
+    traffic_month=0;\r
+    guaranted = 0;\r
+    parse(str)\r
+    {\r
+     y_ok=m_ok=0;  \r
+     valid_columns(ptr,_,'\t',col) switch(col)\r
+     {\r
+      case 2: name = ptr;break;\r
+      case 3: traffic = atol(ptr);break;\r
+      /* column number   - was 7, now 10...*/\r
+      case 7:\r
+      case 8:\r
+      case 9:\r
+      case 10: if (isalpha(*ptr)) /* character, not numeric string = date, just one*/\r
                {\r
-                case 2: if(any_month || eq(ptr2,month)) m_ok = 1; break;\r
-                case 5: if(eq(ptr2,year)) y_ok = 1; break;\r
+                 valid_columns(ptr2,ptr,' ',col2) switch(col2)\r
+                 {\r
+                  case 2: if(any_month || eq(ptr2,month)) m_ok = 1; break;\r
+                  case 5: if(eq(ptr2,year)) y_ok = 1; break;\r
+                 }\r
                }\r
-             }\r
-             else\r
-             {\r
-               if(col == 7) guaranted = atol(ptr);\r
-             }\r
-   }\r
-   \r
-   if(y_ok && m_ok) \r
-   {\r
-    traffic_month += traffic;\r
-    accept_month = 1;\r
-   }\r
-  }\r
-  done;\r
+               else\r
+               {\r
+                 if(col == 7) guaranted = atol(ptr);\r
+               }\r
+     }\r
+     \r
+     if(y_ok && m_ok) \r
+     {\r
+      traffic_month += traffic;\r
+      accept_month = 1;\r
+     }\r
+    }\r
+    done;\r
 \r
-  if(accept_month)\r
-  {\r
-   create(iplog,IpLog);\r
-   iplog->name = name;\r
-   iplog->guaranted = guaranted;\r
-   iplog->traffic = traffic_month;\r
-   insert(iplog,iplogs,desc_order_by,traffic);\r
-   printf(" %ld MB\n",iplog->traffic);\r
-  }\r
-  else\r
-   puts(" no records.");\r
+    if(accept_month)\r
+    {\r
+     create(iplog,IpLog);\r
+     iplog->name = name;\r
+     iplog->guaranted = guaranted;\r
+     iplog->traffic = traffic_month;\r
+     insert(iplog,iplogs,desc_order_by,traffic);\r
+     printf(" %ld MB\n",iplog->traffic);\r
+    }\r
+    else\r
+     puts(" no records.");\r
+   }\r
  }\r
  sprintf(str,"%s/%s-%s.html",html_log_dir,year,month);\r
  printf("Writing %s ...",str);\r
@@ -763,7 +766,7 @@ void parse_ip_log(int argc, char **argv)
 \r
 \r
 /*-----------------------------------------------------------------*/\r
-/* Are you looking for int main (int argc, char **argv) ? :-))     */\r
+/* Are you looking for int main(int argc, char **argv) ? :-))      */\r
 /*-----------------------------------------------------------------*/\r
 \r
 program\r