Mercurial > mercurial > hgweb_xdwtools.cgi

changeset 10:e421bcd3bce4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
xdwaddatn2 done.
author pyon@macmini
date Fri, 06 Apr 2018 18:30:09 +0900
parents cc5262d43399
children 3cecce3b2ce3
files xdwaddatn2.cpp
diffstat 1 files changed, 140 insertions(+), 86 deletions(-) [+]
line wrap: on
line diff
--- a/xdwaddatn2.cpp	Thu Apr 05 21:06:13 2018 +0900
+++ b/xdwaddatn2.cpp	Fri Apr 06 18:30:09 2018 +0900
@@ -15,6 +15,7 @@
 	rm -rf tempXXXX
 */
 
+#include <unistd.h>
 #include <stdbool.h>
 #include <stdio.h>
 #include <string.h>
@@ -66,12 +67,15 @@
 void print_help() {
 	char prog[12] = "xdwaddatn2";
 	fprintf( stderr, "Usage:\n" );
-	fprintf( stderr, " %s -m mtxt x y txt sz tr infile\n", prog );
-	fprintf( stderr, " %s -p page x y txt sz tr infile\n", prog );
-	fprintf( stderr, " %s -m -i infile\n", prog );
-	fprintf( stderr, " %s -p -i infile\n", prog );
-	fprintf( stderr, " %s -v -p -i infile\n", prog );
-	fprintf( stderr, " %s -v -m -i infile\n", prog );
+	fprintf( stderr, " normal mode ( one-liner )\n" );
+	fprintf( stderr, "  %s -m mtxt x y txt sz tr infile\n", prog );
+	fprintf( stderr, "  %s -p page x y txt sz tr infile\n", prog );
+	fprintf( stderr, "  %s -a      x y txt sz tr infile\n", prog );
+	fprintf( stderr, " batch mode ( with addatn.list )\n" );
+	fprintf( stderr, "  %s -M infile\n", prog );
+	fprintf( stderr, "  %s -P infile\n", prog );
+	fprintf( stderr, "  %s -v -P infile\n", prog );
+	fprintf( stderr, "  %s -v -M infile\n", prog );
 }
 
 void print_now( const char *msg ) {
@@ -111,74 +115,62 @@
 	bool pnow  = false;
 	bool mmode = false;
 	bool pmode = false;
-	bool csv   = false;
-	char c;
-	while ( --argc > 0 && ( *++argv )[0] == '-' ) {
-		while ( c = *++argv[0] ) {
-			switch ( c ) {
-				case 'v':
-					pnow = true;
-					print_now( "start." );
-					break;
-				case 'm':	/* matched page: now writing... */
-					mmode = true;
-					break;
-				case 'p':	/* page number: now writing... */
-					pmode = true;
-					break;
-				case 'i':	/* csv file: now writing... */
-					csv = true;
-					break;
-				default:
-					fprintf( stderr, "error: illegal option '%c'.\n", c );
-					print_help();
-					exit( 1 );
-			}
+	bool amode = false;
+	bool batch = false;
+
+	/* アノテーション変数 */
+	int pp, x, y, sz, tr;
+	char mtxt[80];
+	char str[120];
+
+	int opt;
+	while ( ( opt = getopt( argc, argv, "vm:p:aMP" ) ) != -1 ) {
+		switch ( opt ) {
+			case 'v':
+				pnow = true;
+				print_now( "start." );
+				break;
+			case 'm':	/* matched page */
+				mmode = true;
+				strcpy( mtxt, optarg );
+				break;
+			case 'p':	/* page number */
+				pmode = true;
+				pp = atoi( optarg );
+				break;
+			case 'a':	/* all page */
+				amode = true;
+				break;
+			case 'M':
+				mmode = true;
+				batch = true;
+				break;
+			case 'P':
+				pmode = true;
+				batch = true;
+				break;
+			default:
+				fprintf( stderr, "error: illegal option '%c'.\n", opt );
+				print_help();
+				exit( 1 );
 		}
 	}
 
-	if ( argc < 1 || ( mmode && pmode ) || ( !mmode && !pmode )) {
+	if ( argc < 1 || ( mmode && pmode ) || ( !mmode && !pmode && !amode )  ) {
+		print_help();
+		exit( 1 );
+	}
+	if ( ( mmode || pmode ) && argc != 9 && argc != 10 ) {
 		print_help();
 		exit( 1 );
 	}
 
-	/* リストの取り込み */
-	char *al = (char*)malloc( MAXLINE * sizeof( char ) * MAXCOL );
-	char buf[ MAXCOL ];
-	int alN = 0;
-	if ( csv ) {
-		if ( pnow ) print_now( "reading list." );
-		FILE *fp;
-
-		if ( al == NULL ) {
-			fprintf( stderr, "can't allocate memory\n" );
-			exit( 1 );
-		}
-
-		if ( ( fp = fopen( "addatn.list", "r" ) ) == NULL ) {
-			fprintf( stderr, "%s: can't open file [addatn.list]\n", argv[0] );
-			exit ( 1 );
-		}
-		char *p;
-		while ( fgets( buf, sizeof buf, fp ) ) {
-			if ( !strncmp( buf, "#",  1 ) ) continue;
-			if ( !strncmp( buf, "//", 2 ) ) continue;
-			if ( !strcmp( buf, "\n" )     ) continue;
-
-			if ( ( p = strchr( buf, '\n' ) ) != NULL ) {
-				*p = '\0';
-			}
-			strncpy( &al[ alN * MAXCOL ], buf, MAXCOL );
-			alN++;
-		}
-		fclose( fp );
-	}
 
 	/* 本処理：アノテーションを貼付け */
 	if ( pnow ) print_now( "analizing xdw-file." );
 
-	char in_path[ _MAX_PATH ];
-	sprintf( buf, "copy %s %s", argv[0], "tmpXXXX.xdw" );
+	char in_path[ _MAX_PATH ], buf[ MAXCOL ];
+	sprintf( buf, "copy %s %s", argv[ argc - 1 ], "tmpXXXX.xdw" );
 	system( buf );
 	_fullpath( in_path, "tmpXXXX.xdw", _MAX_PATH );
 
@@ -193,36 +185,98 @@
 		print_error( api_result );
 		return 0;
 	}
+	XDW_DOCUMENT_INFO info = { sizeof( XDW_DOCUMENT_INFO ), 0, 0, 0 }; // 総ページ数を得る
+	XDW_GetDocumentInformation( h, &info );
+	int last_page = info.nPages;
+	XDW_FOUND_HANDLE pFoundHandle = NULL;
 
-	if ( !csv ) {
+	/* ワンライナーモード */
+	if ( !batch ) {
+		if ( pnow ) print_now( "normal mode. ( one-liner )" );
+		x   = atoi( argv[ argc - 6 ] );
+		y   = atoi( argv[ argc - 5 ] );
+		strcpy( str, argv[ argc - 4 ] );
+		sz  = atoi( argv[ argc - 3 ] );
+		tr  = atoi( argv[ argc - 2 ] );
+
 		if ( mmode ) {
-			for ( int i = 0; i < alN; i++ ) {
+			for ( int p = 0; p < last_page; p++ ) {
+				api_result = XDW_FindTextInPage( h, p + 1, mtxt, NULL, &pFoundHandle, NULL );
+				if ( pFoundHandle ) {
+					api_result = add_annotation( h, p + 1, x, y, str, &sz, tr );
+					if ( api_result < 0 ) {
+						print_error( api_result );
+						break;
+					}
+				}
+			}
+			XDW_CloseFoundHandle( pFoundHandle );
+		}
+		else if ( pmode ){
+			api_result = add_annotation( h, pp, x, y, str, &sz, tr );
+			if ( api_result < 0 ) {
+				print_error( api_result );
+				return 0;
 			}
 		}
-		else { // pmode のはず
+		else { // amode のはず
+			for ( int p = 0; p < last_page; p++ ) {
+				api_result = add_annotation( h, p + 1, x, y, str, &sz, tr );
+				if ( api_result < 0 ) {
+					print_error( api_result );
+					break;
+				}
+			}
 		}
 	}
+	/* 以下 batch mode */
 	else {
-		if ( pnow ) print_now( "csv mode." );
-		XDW_DOCUMENT_INFO info = { sizeof( XDW_DOCUMENT_INFO ), 0, 0, 0 }; // 総ページ数を得る
-		XDW_GetDocumentInformation( h, &info );
-		int last_page = info.nPages;
+		if ( pnow ) print_now( "batch mode." );
+		/* リストの取り込み */
+		char *al = (char*)malloc( MAXLINE * sizeof( char ) * MAXCOL );
+		int alN = 0;
+		if ( pnow ) print_now( "reading list." );
+		FILE *fp;
+
+		if ( al == NULL ) {
+			fprintf( stderr, "can't allocate memory\n" );
+			exit( 1 );
+		}
 
-		int x, y, sz, tr;
-		char *str, *m, *s;
+		if ( ( fp = fopen( "addatn.list", "r" ) ) == NULL ) {
+			fprintf( stderr, "%s: can't open file [addatn.list]\n", argv[0] );
+			exit ( 1 );
+		}
+		char *z;
+		while ( fgets( buf, sizeof buf, fp ) ) {
+			if ( !strncmp( buf, "#",  1 ) ) continue;
+			if ( !strncmp( buf, "//", 2 ) ) continue;
+			if ( !strcmp( buf, "\n" )     ) continue;
+
+			if ( ( z = strchr( buf, '\n' ) ) != NULL ) {
+				*z = '\0';
+			}
+			strncpy( &al[ alN * MAXCOL ], buf, MAXCOL );
+			alN++;
+		}
+		fclose( fp );
+
+		/* バッチ処理 */
+		char *s;
 		if ( mmode ) {
-			XDW_FOUND_HANDLE pFoundHandle = NULL;
+			if ( pnow ) print_now( "> text match mode." );
+			char *m;
 			for ( int p = 0; p < last_page; p++ ) {
 				for ( int i = 0; i < alN; i++ ) {
 					strncpy( buf, &al[ i * MAXCOL ], MAXCOL );
 					m = strtok( buf, "," );
 					api_result = XDW_FindTextInPage( h, p + 1, m, NULL, &pFoundHandle, NULL );
 					if ( pFoundHandle ) {
-						x = atoi( strtok( NULL, "," ) );
-						y = atoi( strtok( NULL, "," ) );
-						s = strtok( NULL, "," );
-						sz = atoi( strtok( NULL, "," ) );
-						tr = atoi( strtok( NULL, "," ) );
+						x   = atoi( strtok( NULL, "," ) );
+						y   = atoi( strtok( NULL, "," ) );
+						s   = strtok( NULL, "," );
+						sz  = atoi( strtok( NULL, "," ) );
+						tr  = atoi( strtok( NULL, "," ) );
 						api_result = add_annotation( h, p + 1, x, y, s, &sz, tr );
 						if ( api_result < 0 ) {
 							print_error( api_result );
@@ -234,17 +288,17 @@
 			XDW_CloseFoundHandle( pFoundHandle );
 		}
 		else { // pmode のはず
+			if ( pnow ) print_now( "> page number mode." );
 			int p;
 			for ( int i = 0; i < alN; i++ ) {
 				strncpy( buf, &al[ i * MAXCOL ], MAXCOL );
-				m = strtok( buf, "," );
-				p = atoi( m );
+				p = atoi( strtok( buf, "," ) );
 				if ( p > 0 && p <= last_page ) {
-					x = atoi( strtok( NULL, "," ) );
-					y = atoi( strtok( NULL, "," ) );
-					s = strtok( NULL, "," );
-					sz = atoi( strtok( NULL, "," ) );
-					tr = atoi( strtok( NULL, "," ) );
+					x   = atoi( strtok( NULL, "," ) );
+					y   = atoi( strtok( NULL, "," ) );
+					s   = strtok( NULL, "," );
+					sz  = atoi( strtok( NULL, "," ) );
+					tr  = atoi( strtok( NULL, "," ) );
 					api_result = add_annotation( h, p, x, y, s, &sz, tr );
 					if ( api_result < 0 ) {
 						print_error( api_result );
@@ -253,6 +307,7 @@
 				}
 			}
 		}
+		free( al );
 	}
 
 	api_result = XDW_SaveDocument( h, NULL ); // 変更をファイルに反映する
@@ -272,7 +327,6 @@
 	/* 後処理 */
 	if ( pnow ) print_now( "cleaning." );
 	remove( in_path );
-	free( al );
 
 	if ( pnow ) print_now( "done." );
 	return 0;