projects
/
routino
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Imported Upstream version 1.5.1
[routino]
/
src
/
tagmodifier.c
diff --git
a/src/tagmodifier.c
b/src/tagmodifier.c
index
80dba87
..
e01b490
100644
(file)
--- a/
src/tagmodifier.c
+++ b/
src/tagmodifier.c
@@
-1,5
+1,5
@@
/***************************************
/***************************************
- $Header: /home/amb/routino/src/RCS/tagmodifier.c,v 1.7 2010/09/05 18:26:01 amb Exp $
+ $Header: /home/amb/routino/src/RCS/tagmodifier.c,v 1.8 2010/11/13 14:22:28 amb Exp $
Test application for OSM XML file parser / tagging rule testing.
Test application for OSM XML file parser / tagging rule testing.
@@
-29,6
+29,7
@@
#include <errno.h>
#include "files.h"
#include <errno.h>
#include "files.h"
+#include "logging.h"
#include "xmlparse.h"
#include "tagging.h"
#include "xmlparse.h"
#include "tagging.h"
@@
-258,7
+259,7
@@
static int nodeType_function(const char *_tag_,int _type_,const char *id,const c
nnodes++;
if(!(nnodes%1000))
nnodes++;
if(!(nnodes%1000))
- fprintf(stderr,"\rReading: Lines=%ld Nodes=%ld Ways=%ld Relations=%ld",ParseXML_LineNumber(),nnodes,nways,nrelations);
+ fprintf_middle(stderr,"Reading: Lines=%ld Nodes=%ld Ways=%ld Relations=%ld",ParseXML_LineNumber(),nnodes,nways,nrelations);
current_tags=NewTagList();
}
current_tags=NewTagList();
}
@@
-374,7
+375,7
@@
static int wayType_function(const char *_tag_,int _type_,const char *id,const ch
nways++;
if(!(nways%1000))
nways++;
if(!(nways%1000))
- fprintf(stderr,"\rReading: Lines=%ld Nodes=%ld Ways=%ld Relations=%ld",ParseXML_LineNumber(),nnodes,nways,nrelations);
+ fprintf_middle(stderr,"Reading: Lines=%ld Nodes=%ld Ways=%ld Relations=%ld",ParseXML_LineNumber(),nnodes,nways,nrelations);
current_tags=NewTagList();
}
current_tags=NewTagList();
}
@@
-440,7
+441,7
@@
static int relationType_function(const char *_tag_,int _type_,const char *id,con
nrelations++;
if(!(nrelations%1000))
nrelations++;
if(!(nrelations%1000))
- fprintf(stderr,"\rReading: Lines=%ld Nodes=%ld Ways=%ld Relations=%ld",ParseXML_LineNumber(),nnodes,nways,nrelations);
+ fprintf_middle(stderr,"Reading: Lines=%ld Nodes=%ld Ways=%ld Relations=%ld",ParseXML_LineNumber(),nnodes,nways,nrelations);
current_tags=NewTagList();
}
current_tags=NewTagList();
}
@@
-539,6
+540,8
@@
int main(int argc,char **argv)
{
if(!strcmp(argv[arg],"--help"))
print_usage(1);
{
if(!strcmp(argv[arg],"--help"))
print_usage(1);
+ else if(!strcmp(argv[arg],"--loggable"))
+ option_loggable=1;
else if(!strncmp(argv[arg],"--tagging=",10))
tagging=&argv[arg][10];
else if(argv[arg][0]=='-' && argv[arg][1]=='-')
else if(!strncmp(argv[arg],"--tagging=",10))
tagging=&argv[arg][10];
else if(argv[arg][0]=='-' && argv[arg][1]=='-')
@@
-593,11
+596,11
@@
int main(int argc,char **argv)
/* Parse the file */
/* Parse the file */
- fprintf(stderr,"\rReading: Lines=0 Nodes=0 Ways=0 Relations=0");
+ fprintf_first(stderr,"Reading: Lines=0 Nodes=0 Ways=0 Relations=0");
retval=ParseXML(file,xml_toplevel_tags,XMLPARSE_UNKNOWN_ATTR_IGNORE);
retval=ParseXML(file,xml_toplevel_tags,XMLPARSE_UNKNOWN_ATTR_IGNORE);
- fprintf(stderr,"\rRead: Lines=%ld Nodes=%ld Ways=%ld Relations=%ld \n",ParseXML_LineNumber(),nnodes,nways,nrelations);
+ fprintf_last(stderr,"Read: Lines=%ld Nodes=%ld Ways=%ld Relations=%ld",ParseXML_LineNumber(),nnodes,nways,nrelations);
/* Tidy up */
/* Tidy up */
@@
-618,6
+621,7
@@
static void print_usage(int detail)
{
fprintf(stderr,
"Usage: tagmodifier [--help]\n"
{
fprintf(stderr,
"Usage: tagmodifier [--help]\n"
+ " [--loggable]\n"
" [--tagging=<filename>]\n"
" [<filename.osm>]\n");
" [--tagging=<filename>]\n"
" [<filename.osm>]\n");
@@
-626,6
+630,8
@@
static void print_usage(int detail)
"\n"
"--help Prints this information.\n"
"\n"
"\n"
"--help Prints this information.\n"
"\n"
+ "--loggable Print progress messages suitable for logging to file.\n"
+ "\n"
"--tagging=<filename> The name of the XML file containing the tagging rules\n"
" (defaults to 'tagging.xml' in current directory).\n"
"\n"
"--tagging=<filename> The name of the XML file containing the tagging rules\n"
" (defaults to 'tagging.xml' in current directory).\n"
"\n"