aboutsummaryrefslogtreecommitdiff
path: root/syntax.php
diff options
context:
space:
mode:
authorIgor <pashev.igor@gmail.com>2010-11-12 16:53:56 +0300
committerIgor <pashev.igor@gmail.com>2010-11-12 16:53:56 +0300
commitd3a5ea2be22e4c5e3e2b0262d1525bf53d54d48e (patch)
tree090e1f0b34da45e5d9a659207a2773bad8a3345d /syntax.php
parentac2a8ccc05388dcd538ed4adfed19d765b1014be (diff)
downloaddokuwiki-plugin-papers-d3a5ea2be22e4c5e3e2b0262d1525bf53d54d48e.tar.gz
Load fulltexts from the same language namespace; then from the root
Diffstat (limited to 'syntax.php')
-rw-r--r--syntax.php38
1 files changed, 24 insertions, 14 deletions
diff --git a/syntax.php b/syntax.php
index ac925b3..568a3c1 100644
--- a/syntax.php
+++ b/syntax.php
@@ -9,8 +9,6 @@
// must be run within Dokuwiki
if (!defined('DOKU_INC')) die();
-if (!defined('DOKU_LF')) define('DOKU_LF', "\n");
-if (!defined('DOKU_TAB')) define('DOKU_TAB', "\t");
if (!defined('DOKU_PLUGIN')) define('DOKU_PLUGIN', DOKU_INC . 'lib/plugins/');
global $conf;
@@ -154,7 +152,7 @@ class syntax_plugin_papers extends DokuWiki_Syntax_Plugin
case DOKU_LEXER_UNMATCHED:
$renderer->doc .= $this->format_bibtex($bibtex, $options);
// Purge the cache to update depending pages
- if ($this->getConf('purge-cache') || $tag === 'bibtex')
+ if ($this->getConf('purge-cache') && $tag === 'bibtex')
touch(DOKU_CONF . '/local.php');
break;
@@ -190,19 +188,26 @@ class syntax_plugin_papers extends DokuWiki_Syntax_Plugin
$save_lang = $conf['lang'];
$conf['lang'] = $lang;
}
-
+
+ $lang_ns = array();
$papers_ns = $this->getConf('papers_ns');
- if (!empty($lang) && !preg_match('/^:/', $papers_ns))
- $papers_ns = $lang . '/' . $papers_ns;
- // $papers_ns = wikiFN($papers_ns);
+ if (!preg_match('/^:/u', $papers_ns))
+ {
+ $lang_ns[] = '/' . $lang; // look in the same language at first
+ }
+
+ $lang_ns[] = ''; // then in the root namespace
- $res = '';
+ $papers_ns = preg_replace('/:/u', '/', $papers_ns);
+
+
+ $res = '';
$year = ''; $year_prev = '';
$type = ''; $type_prev = '';
$in_list = false;
$dub = array();
$byyear = !isset($options['byyear']) || $options['byyear'];
- $raw = !isset($options['raw']) || !$options['raw'];
+ $raw = isset($options['raw']) && $options['raw'];
$recent = isset($options['recent']) ? $options['recent'] : 9999999;
$count = 0;
@@ -212,7 +217,7 @@ class syntax_plugin_papers extends DokuWiki_Syntax_Plugin
if ($count > $recent)
break;
- if ($raw)
+ if (!$raw)
{
if ($byyear)
{
@@ -269,11 +274,16 @@ class syntax_plugin_papers extends DokuWiki_Syntax_Plugin
$links = array();
foreach ($this->getConf('filetypes') as $type)
{
- $file = $papers_ns . '/' . $entry['id'] . '.' . mb_strtolower($type);
- if (file_exists(PAPERS_DATADIR . $file))
+ $f = $papers_ns . '/' . $entry['id'] . '.' . mb_strtolower($type);
+ foreach ($lang_ns as $ns)
{
- $size = round(filesize(PAPERS_DATADIR . $file) / 1024) . ' ' . $this->getLang('KiB');
- $links[] = '{{:' . preg_replace('/\//u', ':', $file) . "|$type $size}}";
+ $file = $ns . '/' . $f;
+ if (file_exists(PAPERS_DATADIR . $file))
+ {
+ $size = round(filesize(PAPERS_DATADIR . $file) / 1024) . ' ' . $this->getLang('KiB');
+ $links[] = '{{' . preg_replace('/\//u', ':', $file) . "|$type $size}}";
+ break;
+ }
}
}
if (!empty($links))