Show
Ignore:
Timestamp:
13.12.2013 13:22:44 (6 years ago)
Author:
ak19
Message:

Adding in the first working version of the formatconverter program which uses formattools to convert GS2 statements to GS3. Not all the GS2 terms have GS3 equivalents yet and the current ones still need to be run by Dr Bainbridge, but nested IFs and ORs seem to work alright in general. Kathy made the important changes to Makefile.in to get the new formatconverter.cpp to compile. formatconverter.cpp uses the new GS2-to-GS3 specific functions added to formattools.cpp

Files:
1 modified

Legend:

Unmodified
Added
Removed
  • main/trunk/greenstone2/runtime-src/src/recpt/Makefile.in

    r25560 r28760  
    206206    extlinkaction.cpp \ 
    207207    formattools.cpp \ 
     208    formatconverter.cpp \ 
    208209    gtiaction.cpp \ 
    209210    highlighttext.cpp \ 
     
    284285    wizardaction.o  
    285286 
     287CONVERTER_OBJECTS = \ 
     288    cgiargs.o \ 
     289    cgiutils.o \ 
     290    formattools.o \ 
     291    formatconverter.o \ 
     292    summarise.o 
     293 
    286294LIBRARY = gsdlrecpt.a 
    287295 
     
    301309 
    302310# Default target: make both gsdlrecpt.a and the library executable 
    303 all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE) 
     311all: $(LIBRARY) $(EXECUTABLE) $(APACHE_MODULE) formatconverter 
     312 
     313formatconverter: $(CONVERTER_OBJECTS) 
     314    $(CXXLINK) $(CONVERTER_OBJECTS) $(COMMON_DIR)/src/lib/gsdllib.a $(PROTOCOL_DIR)/gsdlprotocol.a $(COLSERVR_DIR)/gsdlcolservr.a 
    304315 
    305316gsdlrecpt.a: $(OBJECTS)