[Hejes-devel] [1498] kulegy.html: AkH links work again

[hejes-devel at nytud.hu]

Revision: 1498
Author:   mihaltz
Date:     2015-09-30 15:52:22 +0200 (Wed, 30 Sep 2015)
Log Message:
-----------
kulegy.html: AkH links work again

Modified Paths:
--------------
    trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
    trunk/web2py/applications/helyesiras_webdev/languages/hu.py
    trunk/web2py/applications/helyesiras_webdev/languages/ru-ru.py
    trunk/web2py/applications/helyesiras_webdev/progress.log
    trunk/web2py/applications/helyesiras_webdev/views/default/kulegy.html

Modified: trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
===================================================================
(Binary files differ)

Modified: trunk/web2py/applications/helyesiras_webdev/languages/hu.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/languages/hu.py	2015-09-30 13:14:16 UTC (rev 1497)
+++ trunk/web2py/applications/helyesiras_webdev/languages/hu.py	2015-09-30 13:52:22 UTC (rev 1498)
@@ -5,6 +5,8 @@
 '%s rows updated': '%s sorok frissítődtek',
 '%Y-%m-%d': '%Y.%m.%d.',
 '%Y-%m-%d %H:%M:%S': '%Y.%m.%d. %H:%M:%S',
+'11. Kiadás': '11. Kiadás',
+'12. Kiadás': '12. Kiadás',
 '[Belső linkek]': '[Belső linkek]',
 'ABC-be rendezés': 'ABC-be rendezés',
 'About': 'About',

Modified: trunk/web2py/applications/helyesiras_webdev/languages/ru-ru.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/languages/ru-ru.py	2015-09-30 13:14:16 UTC (rev 1497)
+++ trunk/web2py/applications/helyesiras_webdev/languages/ru-ru.py	2015-09-30 13:52:22 UTC (rev 1498)
@@ -5,6 +5,8 @@
 '%s rows updated': '%s строк изменено',
 '%Y-%m-%d': '%Y-%m-%d',
 '%Y-%m-%d %H:%M:%S': '%Y-%m-%d %H:%M:%S',
+'11. Kiadás': '11. Kiadás',
+'12. Kiadás': '12. Kiadás',
 'Administrative interface': 'административный интерфейс',
 'Archívum': 'Archívum',
 'Are you sure you want to delete this object?': 'Are you sure you want to delete this object?',

Modified: trunk/web2py/applications/helyesiras_webdev/progress.log
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/progress.log	2015-09-30 13:14:16 UTC (rev 1497)
+++ trunk/web2py/applications/helyesiras_webdev/progress.log	2015-09-30 13:52:22 UTC (rev 1498)
@@ -1509,3 +1509,20 @@
 [2015-09-03 03:09:28] EDIT helyesiras_webdev/views/default/suggest.html: 0
 [2015-09-03 03:11:10] EDIT helyesiras_webdev/views/default/suggest.html: 0
 [2015-09-03 03:11:28] EDIT helyesiras_webdev/views/default/suggest.html: 0
+[2015-09-09 15:56:30] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/valtozas.jpg: 471
+[2015-09-14 11:30:10] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/szekeres_adrien.jpg: 63
+[2015-09-18 14:02:18] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/logika.jpg: 357
+[2015-09-22 13:46:14] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/napejegyenloseg.jpg: 38
+[2015-09-24 15:12:34] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/azonban.jpg: 29
+[2015-09-29 16:15:06] UPLOAD /usr/local/opt/web2py.2.4.6-stable/applications/helyesiras_webdev/static/blog/fejenallas.jpg: 45
+[2015-09-30 15:26:18] EDIT helyesiras_webdev/views/default/kulegy.html: 0
+[2015-09-30 15:28:07] EDIT helyesiras_webdev/views/default/kulegy.html: 0
+[2015-09-30 15:28:11] EDIT helyesiras_webdev/views/default/kulegy.html: 0
+[2015-09-30 15:29:10] EDIT helyesiras_webdev/views/default/kulegy.html: 0
+[2015-09-30 15:29:14] EDIT helyesiras_webdev/views/default/kulegy.html: 0
+[2015-09-30 15:30:17] EDIT helyesiras_webdev/views/default/kulegy.html: 0
+[2015-09-30 15:31:19] EDIT helyesiras_webdev/views/default/kulegy.html: 0
+[2015-09-30 15:32:09] EDIT helyesiras_webdev/views/default/kulegy.html: 0
+[2015-09-30 15:34:45] EDIT helyesiras_webdev/views/default/kulegy.html: 1
+[2015-09-30 15:35:29] EDIT helyesiras_webdev/views/default/kulegy.html: 0
+[2015-09-30 15:38:35] EDIT helyesiras_webdev/views/default/kulegy.html: 0

Modified: trunk/web2py/applications/helyesiras_webdev/views/default/kulegy.html
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/views/default/kulegy.html	2015-09-30 13:14:16 UTC (rev 1497)
+++ trunk/web2py/applications/helyesiras_webdev/views/default/kulegy.html	2015-09-30 13:52:22 UTC (rev 1498)
@@ -128,11 +128,12 @@
     tmp = result['res_xhtml']
 
     # add hyperlinks for AkH refs
-    def addlink(matchobj): 
-      a = A(matchobj.group(1), _href=URL(c='default', f='akh', anchor=matchobj.group(2)), _class='alink', _target="blank")
+    def addlink(matchobj):
+      fn = 'akh' + str(matchobj.group(2))
+      a = A(matchobj.group(1), _href=URL(c='default', f=fn, anchor=matchobj.group(3)), _class='alink', _target="blank")
       return '<span class="refid">' + a.xml() + '</span>'
     from re import sub
-    tmp = sub('<span class="refid">(AkH-([\da-z]+)(--[\da-z]+)?)</span>', addlink, tmp)
+    tmp = sub('<span class="refid">(AkH(11|12)-([\da-z]+)(--[\da-z]+)?)</span>', addlink, tmp)
 
     # replace '--' with nagykötőjel
     tmp = tmp.replace('--', unicode('–', 'utf8'))