[ICU-4450] Use apputil library for commonly used demo functions.

X-SVN-Rev: 17698
unicode-org · May 26, 2005 · d700e14 · d700e14
1 parent 5ccce7e
commit d700e14
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 119 deletions.
diff --git a/convexp/Makefile.in b/convexp/Makefile.in
@@ -23,6 +23,7 @@ CLEANFILES = *~
 TARGET = convexp
 
 CPPFLAGS += -I$(ICU_SOURCE)/common -I$(top_srcdir)/apputil
+ICULIBS += -L../apputil -lapputil
 
 OBJECTS = printcp.o params.o convexp.o
 

diff --git a/convexp/convexp.cpp b/convexp/convexp.cpp
@@ -35,7 +35,9 @@
 
 #include "printcp.h"
 #include "params.h"
+
 #include "demo_settings.h"
+#include "demoutil.h"
 
 /*
 IANA states that an alias may be up to 40 characters.
@@ -715,37 +717,6 @@ static void printAliasTable() {
     printf(endTable);
 }
 
-/**
- * @returns 1 if open failed
- */
-static int printTemplateFile(char *templateFileName) {
-    size_t size = 0;
-    size_t savedPos;
-    char *buffer;
-    FILE *templateFile = fopen(templateFileName, "rb");
-
-    if (templateFile == NULL) {
-        printf("<!-- ERROR: %s cannot be opened -->\n", templateFileName);
-        return 1;
-    }   
-
-    /* Go to the end, find the size, and go back to the beginning. */
-    savedPos = ftell(templateFile);
-    fseek(templateFile, 0, SEEK_END);
-    size = ftell(templateFile);
-    fseek(templateFile, savedPos, SEEK_SET);
-
-    /* Read in the whole file and print it out */
-    buffer = (char *)malloc(size+1);
-    fread(buffer, size, 1, templateFile);
-    buffer[size] = 0;    // NULL terminate for printing.
-    printf("%s", buffer);
-
-    free(buffer);
-    fclose(templateFile);
-    return 0;
-}
-
 U_CDECL_BEGIN
 static int32_t U_CALLCONV
 convexp_hashPointer(const UHashTok key) {
@@ -767,18 +738,22 @@ main(int argc, const char *argv[]) {
     UErrorCode errorCode = U_ZERO_ERROR;
     const char *cgi;
 
-    gScriptName=getenv("SCRIPT_NAME"); 
+    gScriptName=getenv("SCRIPT_NAME");
+    if (gScriptName == NULL) {
+        gScriptName = "convexp";
+    }
 
     puts(htmlHeader);
-    if (printTemplateFile(DEMO_COMMON_DIR "convexp-header.html")) {
+    if (!printHTMLFragment(NULL, NULL, DEMO_COMMON_DIR "convexp-header.html")) {
         puts(defaultHeader);
     }
     puts(endHeaderBeginBody);
-    printTemplateFile(DEMO_COMMON_MASTHEAD);
-    puts(DEMO_BEGIN_LEFT_NAV);
-    printTemplateFile(DEMO_COMMON_LEFTNAV);
-    puts(DEMO_END_LEFT_NAV);
-    puts(DEMO_BEGIN_CONTENT);
+    if (printHTMLFragment(NULL, NULL, DEMO_COMMON_MASTHEAD)) {
+        puts(DEMO_BEGIN_LEFT_NAV);
+        printHTMLFragment(NULL, NULL, DEMO_COMMON_LEFTNAV);
+        puts(DEMO_END_LEFT_NAV);
+        puts(DEMO_BEGIN_CONTENT);
+    }
     puts(breadCrumbMainHeader);
 
     gStandardsSelected = uhash_open(convexp_hashPointer, convexp_comparePointer, &errorCode);
@@ -845,7 +820,7 @@ main(int argc, const char *argv[]) {
     printf(versions, icuVString);
 
     puts(DEMO_END_CONTENT);
-    printTemplateFile(DEMO_COMMON_FOOTER);
+    printHTMLFragment(NULL, NULL, DEMO_COMMON_FOOTER);
     puts(htmlFooter);
 
     uhash_close(gStandardsSelected);

diff --git a/idnbrowser/Makefile.in b/idnbrowser/Makefile.in
@@ -22,15 +22,13 @@ CLEANFILES = *~
 ## Target information
 TARGET = idnbrowser 
 
-#LDFLAGS += -L../locexp/util -liculxutil $(LDFLAGS_USTDIO)
-#LDFLAGS += $(LDFLAGS_TOOLUTIL)
 CPPFLAGS += -I$(ICU_SOURCE)/common
 CPPFLAGS += -I$(top_srcdir)/apputil
 
 # ICULIBS includes all standard ICU libraries.
 # if we wanted only part of the ICU, we could use (for example) just '$(LIBS) -licuuc -lusort' ...
 # -ldl is needed for DLL version
-#ICULIBS    +=  -lustdio 
+ICULIBS += -L../apputil -lapputil
 
 # Want to make sure the usort.h dependency is not on the installed version .. 
 CPPFLAGS  += -I../locexp/util

diff --git a/idnbrowser/idnbrwsr.cpp b/idnbrowser/idnbrwsr.cpp
@@ -30,7 +30,9 @@
 #include "unicode/uscript.h"
 #include "unicode/uniset.h"
 #include "idnbrwsr.h"
+
 #include "demo_settings.h"
+#include "demoutil.h"
 
 //#ifdef WIN32
 //#   define _WIN32_WINNT 0x0400 
@@ -619,37 +621,6 @@ parseString(const char *s, int32_t srcLen,
     return length;
 }
 
-/**
- * @returns 1 if open failed
- */
-static int printTemplateFile(char *templateFileName) {
-    size_t size = 0;
-    size_t savedPos;
-    char *buffer;
-    FILE *templateFile = fopen(templateFileName, "rb");
-
-    if (templateFile == NULL) {
-        printf("<!-- ERROR: %s cannot be opened -->\n", templateFileName);
-        return 1;
-    }   
-
-    /* Go to the end, find the size, and go back to the beginning. */
-    savedPos = ftell(templateFile);
-    fseek(templateFile, 0, SEEK_END);
-    size = ftell(templateFile);
-    fseek(templateFile, savedPos, SEEK_SET);
-
-    /* Read in the whole file and print it out */
-    buffer = (char *)malloc(size+1);
-    fread(buffer, size, 1, templateFile);
-    buffer[size] = 0;    // NULL terminate for printing.
-    printf("%s", buffer);
-
-    free(buffer);
-    fclose(templateFile);
-    return 0;
-}
-
 enum QueryOptionsEnum {
     INPUT,
     INPUT_TYPE,
@@ -676,15 +647,16 @@ main(int argc, const char *argv[]) {
 
     script=getenv("SCRIPT_NAME"); 
     puts(htmlHeader);
-    if (printTemplateFile(DEMO_COMMON_DIR "idna-header.html")) {
+    if (!printHTMLFragment(NULL, NULL, DEMO_COMMON_DIR "idna-header.html")) {
         puts(defaultHeader);
     }
     puts(endHeaderBeginBody);
-    printTemplateFile(DEMO_COMMON_MASTHEAD);
-    puts(DEMO_BEGIN_LEFT_NAV);
-    printTemplateFile(DEMO_COMMON_LEFTNAV);
-    puts(DEMO_END_LEFT_NAV);
-    puts(DEMO_BEGIN_CONTENT);
+    if (printHTMLFragment(NULL, NULL, DEMO_COMMON_MASTHEAD)) {
+        puts(DEMO_BEGIN_LEFT_NAV);
+        printHTMLFragment(NULL, NULL, DEMO_COMMON_LEFTNAV);
+        puts(DEMO_END_LEFT_NAV);
+        puts(DEMO_BEGIN_CONTENT);
+    }
     puts(breadCrumbMainHeader);
 
     inputLength=0;
@@ -827,7 +799,7 @@ main(int argc, const char *argv[]) {
     printf(versions, "3.2", ivString);
 
     puts(DEMO_END_CONTENT);
-    printTemplateFile(DEMO_COMMON_FOOTER);
+    printHTMLFragment(NULL, NULL, DEMO_COMMON_FOOTER);
     puts(htmlFooter);
 
     us.releaseBuffer();

diff --git a/nbrowser/Makefile.in b/nbrowser/Makefile.in
@@ -30,7 +30,7 @@ CPPFLAGS += -I$(top_srcdir)/apputil
 # ICULIBS includes all standard ICU libraries.
 # if we wanted only part of the ICU, we could use (for example) just '$(LIBS) -licuuc -lusort' ...
 # -ldl is needed for DLL version
-#ICULIBS    +=  -lustdio 
+ICULIBS += -L../apputil -lapputil
 
 # Want to make sure the usort.h dependency is not on the installed version .. 
 CPPFLAGS  += -I../locexp/util

diff --git a/nbrowser/nbrowser.cpp b/nbrowser/nbrowser.cpp
@@ -29,7 +29,9 @@
 #include "unicode/unistr.h"
 #include "unicode/unorm.h"
 #include "unormimp.h"           // ### TODO internal file, for normalization prototype
+
 #include "demo_settings.h"
+#include "demoutil.h"
 
 #define LENGTHOF(array) (sizeof(array)/sizeof((array)[0]))
 
@@ -286,37 +288,6 @@ parseString(const char *s,
     }
 }
 
-/**
- * @returns 1 if open failed
- */
-static int printTemplateFile(char *templateFileName) {
-    size_t size = 0;
-    size_t savedPos;
-    char *buffer;
-    FILE *templateFile = fopen(templateFileName, "rb");
-
-    if (templateFile == NULL) {
-        printf("<!-- ERROR: %s cannot be opened -->\n", templateFileName);
-        return 1;
-    }   
-
-    /* Go to the end, find the size, and go back to the beginning. */
-    savedPos = ftell(templateFile);
-    fseek(templateFile, 0, SEEK_END);
-    size = ftell(templateFile);
-    fseek(templateFile, savedPos, SEEK_SET);
-
-    /* Read in the whole file and print it out */
-    buffer = (char *)malloc(size+1);
-    fread(buffer, size, 1, templateFile);
-    buffer[size] = 0;    // NULL terminate for printing.
-    printf("%s", buffer);
-
-    free(buffer);
-    fclose(templateFile);
-    return 0;
-}
-
 extern int
 main(int argc, const char *argv[]) {
     UChar input[100], buffer16[600]; // buffer16 should be 6 times longer than input for \\uhhhh
@@ -330,15 +301,16 @@ main(int argc, const char *argv[]) {
 
     script=getenv("SCRIPT_NAME"); //"/cgi-bin/nbrowser"
     puts(htmlHeader);
-    if (printTemplateFile(DEMO_COMMON_DIR "normalization-header.html")) {
+    if (!printHTMLFragment(NULL, NULL, DEMO_COMMON_DIR "normalization-header.html")) {
         puts(defaultHeader);
     }
     puts(endHeaderBeginBody);
-    printTemplateFile(DEMO_COMMON_MASTHEAD);
-    puts(DEMO_BEGIN_LEFT_NAV);
-    printTemplateFile(DEMO_COMMON_LEFTNAV);
-    puts(DEMO_END_LEFT_NAV);
-    puts(DEMO_BEGIN_CONTENT);
+    if (printHTMLFragment(NULL, NULL, DEMO_COMMON_MASTHEAD)) {
+        puts(DEMO_BEGIN_LEFT_NAV);
+        printHTMLFragment(NULL, NULL, DEMO_COMMON_LEFTNAV);
+        puts(DEMO_END_LEFT_NAV);
+        puts(DEMO_BEGIN_CONTENT);
+    }
     puts(breadCrumbMainHeader);
 
     inputLength=options=0;
@@ -427,7 +399,7 @@ main(int argc, const char *argv[]) {
     printf(versions, uvString, ivString);
 
     puts(DEMO_END_CONTENT);
-    printTemplateFile(DEMO_COMMON_FOOTER);
+    printHTMLFragment(NULL, NULL, DEMO_COMMON_FOOTER);
     puts(htmlFooter);
 
     return 0;