|
|
@@ -41,7 +41,7 @@
|
|
|
// If the database is already open, we'll close it
|
|
|
// We might be opening this object with a new filename, so we'll be safe
|
|
|
--- htcommon/HtConfiguration.cc.orig 2001-02-23 01:31:29.000000000 +0100
|
|
|
-+++ htcommon/HtConfiguration.cc 2002-12-13 14:38:08.000000000 +0100
|
|
|
++++ htcommon/HtConfiguration.cc 2002-12-16 09:29:32.000000000 +0100
|
|
|
@@ -150,7 +150,7 @@
|
|
|
|
|
|
//*********************************************************************
|
|
|
@@ -96,3 +96,77 @@
|
|
|
int retValue=default_value;
|
|
|
String tmpStr=Find(aUrl,value);
|
|
|
if (tmpStr[0]!=0) {
|
|
|
+@@ -249,7 +249,6 @@
|
|
|
+
|
|
|
+ //********************************************************************
|
|
|
+ //
|
|
|
+-inline
|
|
|
+ String HtConfiguration::ParseString(const char *str) const {
|
|
|
+ return ParsedString(str).get(dcGlobalVars);
|
|
|
+ }
|
|
|
+--- htcommon/HtConfiguration.h.orig 2001-02-23 01:31:29.000000000 +0100
|
|
|
++++ htcommon/HtConfiguration.h 2002-12-16 09:52:42.000000000 +0100
|
|
|
+@@ -50,7 +50,6 @@
|
|
|
+ int Value(URL *aUrl,const char *value,int default_value = 0);
|
|
|
+ double Double(URL *aUrl,const char *value,double default_value = 0);
|
|
|
+ int Boolean(URL *aUrl,const char *value,int default_value = 0);
|
|
|
+- inline
|
|
|
+ String ParseString(const char*) const; // parse ${var} string
|
|
|
+ String getFileName() const { return FileName; }
|
|
|
+
|
|
|
+--- htlib/HtDateTime.h.orig 2001-02-23 01:31:32.000000000 +0100
|
|
|
++++ htlib/HtDateTime.h 2002-12-16 10:00:25.000000000 +0100
|
|
|
+@@ -182,8 +182,8 @@
|
|
|
+ void SetDateTime(const time_t *t) { Ht_t = *t; } // by pointer
|
|
|
+
|
|
|
+ // Set object time_t value from a struct tm
|
|
|
+- inline void SetDateTime(struct tm *); // by pointer
|
|
|
+- inline void SetDateTime(struct tm &t) { SetDateTime(&t);} // by reference
|
|
|
++ void SetDateTime(struct tm *); // by pointer
|
|
|
++ void SetDateTime(struct tm &t) { SetDateTime(&t);} // by reference
|
|
|
+
|
|
|
+ // Set GM Time from single values input
|
|
|
+ // Return true if it all went good, false else
|
|
|
+@@ -311,8 +311,8 @@
|
|
|
+
|
|
|
+ // For comparisons - between objects of the same class
|
|
|
+
|
|
|
+- inline bool operator==(const HtDateTime &right) const;
|
|
|
+- inline bool operator<(const HtDateTime &right) const;
|
|
|
++ bool operator==(const HtDateTime &right) const;
|
|
|
++ bool operator<(const HtDateTime &right) const;
|
|
|
+
|
|
|
+ bool operator!=(const HtDateTime &right) const
|
|
|
+ {return !( *this == right );}
|
|
|
+@@ -350,8 +350,8 @@
|
|
|
+
|
|
|
+ // For Copy
|
|
|
+
|
|
|
+- inline HtDateTime &operator=(const HtDateTime &right);
|
|
|
+- inline HtDateTime &operator=(const int right);
|
|
|
++ HtDateTime &operator=(const HtDateTime &right);
|
|
|
++ HtDateTime &operator=(const int right);
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+--- htdig/ExternalTransport.h.orig 2001-02-23 01:31:30.000000000 +0100
|
|
|
++++ htdig/ExternalTransport.h 2002-12-16 10:11:01.000000000 +0100
|
|
|
+@@ -26,7 +26,7 @@
|
|
|
+ class ExternalTransport;
|
|
|
+ class ExternalTransport_Response : public Transport_Response
|
|
|
+ {
|
|
|
+- friend ExternalTransport;
|
|
|
++ friend class ExternalTransport;
|
|
|
+
|
|
|
+ // Nothing else... We just want it so we can access the protected fields
|
|
|
+ };
|
|
|
+--- htsearch/Display.cc.orig 2001-02-23 01:31:34.000000000 +0100
|
|
|
++++ htsearch/Display.cc 2002-12-16 10:37:22.000000000 +0100
|
|
|
+@@ -36,6 +36,7 @@
|
|
|
+ #include <syslog.h>
|
|
|
+ #include <locale.h>
|
|
|
+ #include <math.h>
|
|
|
++#include <values.h>
|
|
|
+
|
|
|
+ #if !defined(DBL_MAX) && defined(MAXFLOAT)
|
|
|
+ # define DBL_MAX MAXFLOAT
|