Changeset 0e3df7e for app/src/common

Timestamp:

05/08/08 15:42:37 (17 years ago)

Author:

obrebski <obrebski@…>

Branches:

master, help

Children:

40358d2

Parents:

adb4c8d

git-author:

obrebski <obrebski@…> (05/08/08 15:42:37)

git-committer:

obrebski <obrebski@…> (05/08/08 15:42:37)

Message:

process_seg() naprawione, 'lem -s kor -I kor' nie zawiesza sie

git-svn-id: ​svn://atos.wmid.amu.edu.pl/utt@46 e293616e-ec6a-49c2-aa92-f4a8b91c5d16

Location:

app/src/common

Files:

• common.cc (modified) (2 diffs)
• common.h (modified) (5 diffs)

app/src/common/common.cc

@@ -15 +15 @@
 bool one_field=false;
 bool one_line=false;
-char output_field_prefix[32];
-char input_field_prefix[32];
+char output_field_prefix[FIELD_PREFIX_MAXLEN];
+char input_field_prefix[FIELD_PREFIX_MAXLEN];
 
 extern int argc;
@@ -32 +32 @@
 }
 
-
-
-
-/*
-parameters:
-        -name - field name, long or short
-        +prefix - field name with ':' appended if long name
-return value:
-        1 if correct field name, 0 otherwise
-examples:
-name    prefix  r.v.
-lem     lem:    1
-@       @       1
-::      'undef' 0
-a,b     'undef' 0
-*/
-int fieldprefix(char *name, char *prefix)
-{
-  if (ispunct(name[0]) && name[1]=='\0') // correct short name
-  {
-    strcpy(prefix, name); return 1;
-  }
-
-  int i=0;
-  while(name[i]!='\0' && isalnum(name[i])) ++i;
-  
-  if(name[i]=='\0' && i>0) // correct long name
-  {
-    sprintf(prefix,"%s:",name); return 1;
-  }
-
-  // incorrect
-  return 0;
-}
 
 

app/src/common/common.h

@@ -24 +24 @@
 #define MAXAUX 16
 #define FIELD_SEP " \t\n"
+#define FIELD_PREFIX_MAXLEN 32
 
 
@@ -67 +68 @@
 extern int expand_path(char* inpath, char* outpath);
 
-extern int fieldprefix(char *name, char *prefix);
-
-
 /**************************************************
  * problems with casing                           */
 // sprawdzenie wielkosci liter
-// warto¶æ zwracana:
-// 0 - wszystkie ma³e litery
+// warto¶Ê zwracana:
+// 0 - wszystkie ma³e litery
 // 1 - pierwsza wielka, reszta male
 // 2 - wszystkie wielkie
@@ -105 +103 @@
 
 // przepisuje s do d
-// nadajac wielko¶æ liter zgodnie z warto¶ci± casing
-// casing - warto¶æ zwracana przez casing()
-// je¶li casing==3 przepisuje bez zmian (za ma³o informacji)
+// nadajac wielko¶Ê liter zgodnie z warto¶ci± casing
+// casing - warto¶Ê zwracana przez casing()
+// je¶li casing==3 przepisuje bez zmian (za ma³o informacji)
 inline void restorecasing(char *s, char *d, int casing)
 {
@@ -186 +184 @@
 
 
+/*
+parameters:
+        -name - field name, long or short
+        +prefix - field name with ':' appended if long name
+return value:
+        1 if correct field name, 0 otherwise
+examples:
+name    prefix  r.v.
+lem     lem:    1
+@       @       1
+::      'undef' 0
+a,b     'undef' 0
+*/
+inline
+int fieldprefix(char *name, char *prefix)
+{
+  if (ispunct(name[0]) && name[1]=='\0') // correct short name
+  {
+    strcpy(prefix, name); return 1;
+  }
+
+  int i=0;
+  while(name[i]!='\0' && isalnum(name[i])) ++i;
+  
+  if(name[i]=='\0' && i>0) // correct long name
+  {
+    sprintf(prefix,"%s:",name); return 1;
+  }
+
+  // incorrect
+  return 0;
+}
+
 inline
 bool process_seg(char* seg, gengetopt_args_info& args)
 {
   char buf[256];
+  char pref[FIELD_PREFIX_MAXLEN];
   bool ret = !args.process_given;
   if(args.process_given)
@@ -205 +237 @@
 
   for(int i=0; i<args.select_given; ++i)
-    if(! getfield(seg,args.select_arg[i],buf))
-      return false;
+    {
+      fieldprefix(args.select_arg[i],pref); // !!! ŁATKA - ZOPTYMALIZOWAĆ !!!
+      if(! getfield(seg,pref,buf))
+        return false;
+    }
   for(int i=0; i<args.ignore_given; ++i)
-    if(getfield(seg,args.ignore_arg[i],buf))
-      return false;
+    {
+      fieldprefix(args.ignore_arg[i],pref);  // !!! ŁATKA - ZOPTYMALIZOWAĆ !!!
+      if(getfield(seg,pref,buf))
+        return false;
+    }
   
   if(args.input_field_given & !getfield(seg,input_field_prefix,buf))