diff --git a/htdocs/okapi/core.php b/htdocs/okapi/core.php
index 589bb88c..45b4c839 100644
--- a/htdocs/okapi/core.php
+++ b/htdocs/okapi/core.php
@@ -201,6 +201,7 @@ class OkapiExceptionHandler
$exception_info .= (isset($_SERVER['REQUEST_URI']) ? "--- OKAPI method called ---\n".
preg_replace("/([?&])/", "\n$1", $_SERVER['REQUEST_URI'])."\n\n" : "");
+ $exception_info .= "--- OKAPI revision ---\n".Okapi::$revision."\n\n";
$exception_info .= "--- Request headers ---\n".implode("\n", array_map(
function($k, $v) { return "$k: $v"; },
array_keys(getallheaders()), array_values(getallheaders())
@@ -798,7 +799,7 @@ class Okapi
{
public static $data_store;
public static $server;
- public static $revision = 764; # This gets replaced in automatically deployed packages
+ public static $revision = 768; # This gets replaced in automatically deployed packages
private static $okapi_vars = null;
/** Get a variable stored in okapi_vars. If variable not found, return $default. */
diff --git a/htdocs/okapi/services/caches/geocache.xml b/htdocs/okapi/services/caches/geocache.xml
index aebf7529..b7641b80 100644
--- a/htdocs/okapi/services/caches/geocache.xml
+++ b/htdocs/okapi/services/caches/geocache.xml
@@ -289,9 +289,14 @@
last_modified - date and time (ISO 8601) when the
geocache was last modified (changed status, attributes, etc.),
date_created - date and time (ISO 8601) when the
- geocache was initially created,
-
date_hidden - date and time (ISO 8601) when the
- geocache was first hidden,
+ geocache was listed at the Opencaching site,
+
date_hidden - date and time (ISO 8601) when
+
+
the geocache was first hidden (for physical caches), or
+
the geocache was first published (for virtual caches), or
+
the event takes place (for event caches),
+
+
diff --git a/htdocs/okapi/services/caches/geocaches.php b/htdocs/okapi/services/caches/geocaches.php
index d1dc876f..9a1139c9 100644
--- a/htdocs/okapi/services/caches/geocaches.php
+++ b/htdocs/okapi/services/caches/geocaches.php
@@ -151,6 +151,7 @@ class WebService
# - Total numbers of founds and notfounds are kept in the "stat_caches" table.
# - search_time and way_length are both round trip values and cannot be null;
# 0 = not specified
+ # - will-attend-count is stored in separate field
$rs = Db::query("
select
@@ -163,6 +164,7 @@ class WebService
ifnull(sc.toprating, 0) as topratings,
ifnull(sc.found, 0) as founds,
ifnull(sc.notfound, 0) as notfounds,
+ ifnull(sc.will_attend, 0) as willattends,
sc.last_found,
0 as votes, 0 as score
-- SEE ALSO OC.PL BRANCH BELOW
@@ -181,6 +183,7 @@ class WebService
# - Total numbers of found and notfounds are kept in the "caches" table.
# - search_time is round trip and way_length one way or both ways (this is different on OCDE!);
# both can be null; 0 or null = not specified
+ # - will-attend-count is stored in caches.notfounds
$rs = Db::query("
select
@@ -193,6 +196,7 @@ class WebService
c.topratings,
c.founds,
c.notfounds,
+ c.notfounds as willattends,
c.last_found,
c.votes, c.score
-- SEE ALSO OC.DE BRANCH ABOVE
@@ -254,11 +258,8 @@ class WebService
}
break;
case 'willattends':
- # OCPL stats count "Will attend" log entries as "notfounds"
- # (just another pecularity regarding "event caches").
- # I am not sure about OCDE branch though...
if ($row['type'] == 6) { # event
- $entry['willattends'] = $row['notfounds'] + 0;
+ $entry['willattends'] = $row['willattends'] + 0;
} else { # non-event
$entry['willattends'] = 0;
}
diff --git a/htdocs/okapi/views/signup.tpl.php b/htdocs/okapi/views/signup.tpl.php
index 67509f36..5f7160f7 100644
--- a/htdocs/okapi/views/signup.tpl.php
+++ b/htdocs/okapi/views/signup.tpl.php
@@ -69,7 +69,8 @@
-
= $vars['site_name'] ?> = $vars['data_license_html'] ?>, and
+
= $vars['site_name'] ?> = $vars['data_license_html'] ?>
+ (these differ across various OC nodes!), and