Macros unresolved in GS3: images in collections don't display

[ak19]

• In Greenstone 3
• _httpprefix_ and _httpdocimage_ macros weren't getting resolved suddenly so that images in collections didn't display

GS3 svn version of 26 April 2008 still works fine (and possibly some versions thereafter).

Problem location:

• AbstractGS2DocumentRetrieve.java.

Older working versions created the database and the MacroResolver in the AbstractGS2DocumentRetrieve constructor. The change over to a new database meant that the db construction code moved into the configure() method. So did the construction of the MacroResolver (GS2MacroResolver in this particular case) which is initialised with the db upon construction.

Prelimary solution that works (but must ask Katherine if this is a tidy enough solution):

1. Added a default constructor to GS2MacroResolver.java and a setDB(db) method.
2. AbstractGS2DocumentRetrieve constructor now creates the GS2MacroResolver object by calling its default constructor. Now configure() does not call the GS2MacroResolver constructor anymore, but instead calls the GS2MacroResolver.setDB(db) method and passes the database object just created.

Problem with solution: Untidyness. Method setDB() is specific to GS2MacroResolver. This means that AbstractGS2DocumentRetrieve.configure() has to cast its MacroResolver member variable to GS2MacroResolver to call setDB.

Many thanks to Dr Bainbridge for lots of help in hunting down this bug.

[ak19]

I've committed these changes now.

[ak19]

Dr Bainbridge okayed the changes with some slight modification.