change default appspot domain and fix setup bug

Author: siongui

dictionary/app/partials/buttons.html

@@ -1,11 +1,11 @@
 <div class="floating-buttons">
 <div>
-<a href="https://twitter.com/share" class="twitter-share-button" data-url="http://dictionary.online-dhamma.net/" data-count="vertical">Tweet</a>
+<a href="https://twitter.com/share" class="twitter-share-button" data-url="{$ dicWebAppUrl $}" data-count="vertical">Tweet</a>
 </div>
 <!-- Place this tag where you want the +1 button to render -->
-<div class="g-plusone" data-size="tall" data-href="http://dictionary.online-dhamma.net/"></div>
+<div class="g-plusone" data-size="tall" data-href="{$ dicWebAppUrl $}"></div>
 <!-- Place the code for your plugin wherever you want the plugin to appear on your page. -->
-<div class="fb-like" data-href="http://dictionary.online-dhamma.net/" data-send="true" data-layout="box_count" data-show-faces="true"></div>
+<div class="fb-like" data-href="{$ dicWebAppUrl $}" data-send="true" data-layout="box_count" data-show-faces="true"></div>
 </div>
 
 <!-- Place this render call where appropriate -->

dictionary/mainweb.py

@@ -43,15 +43,23 @@
   r"/browse/([^/]+)", "PrefixPage",
 )
 
+
+def RedirectToNewDomain(oldDomain, newDomain):
+  if web.ctx.host.split(':')[0] == oldDomain:
+    url = newDomain + urllib.quote(web.ctx.path.encode('utf-8')) + web.ctx.query
+    raise web.redirect(url)
+
 def commonTemplateValues(urlLocale, reqHandlerName, prefix=None, word=None):
   userLocale = getLocale(urlLocale, web.ctx.env.get('HTTP_ACCEPT_LANGUAGE'))
   i18n.setLocale(userLocale)
   template_values = {
 #    'serverEnv': 'ec2',
 #    'tpkWebAppUrl': 'http://tipitaka.sutta.org/',
     'serverEnv': 'appspot',
-#    'tpkWebAppUrl': 'http://epalitipitaka.appspot.com/',
-    'tpkWebAppUrl': 'http://tipitaka.online-dhamma.net/',
+    'tpkWebAppUrl': 'http://epalitipitaka.appspot.com/',
+    'dicWebAppUrl': 'http://palidictionary.appspot.com/',
+#    'tpkWebAppUrl': 'http://tipitaka.online-dhamma.net/',
+#    'dicWebAppUrl': 'http://dictionary.online-dhamma.net/',
     'htmlTitle': getHtmlTitle(userLocale, reqHandlerName, i18n, prefix, word),
     'userLocale': userLocale,
     'locales': json.dumps(i18n.locales),
@@ -65,25 +73,11 @@ def commonTemplateValues(urlLocale, reqHandlerName, prefix=None, word=None):
 
 class MainPage:
   def GET(self, urlLocale=None):
-    if web.ctx.host.split(':')[0] == "palidictionary.appspot.com":
-      # redirect to new domain
-      url = "http://dictionary.online-dhamma.net" + \
-            urllib.quote(web.ctx.path.encode('utf-8')) + \
-            web.ctx.query
-      raise web.redirect(url)
-
     template_values = commonTemplateValues(urlLocale, self.__class__.__name__)
     template = jinja_environment.get_template('index.html')
     return template.render(template_values)
 
 def commonPage(prefix, word, reqHandlerName, urlLocale=None):
-  if web.ctx.host.split(':')[0] == "palidictionary.appspot.com":
-    # redirect to new domain
-    url = "http://dictionary.online-dhamma.net" + \
-          urllib.quote(web.ctx.path.encode('utf-8')) + \
-          web.ctx.query
-    raise web.redirect(url)
-
   if type(prefix) is not unicode:
     prefix = prefix.decode('utf-8')
 

dictionary/serviceweb.py

@@ -28,7 +28,7 @@ def GET(self, word):
 
 class robots:
   def GET(self):
-    if web.ctx.host == 'dictionary.online-dhamma.net':
+    if web.ctx.host == 'palidictionary.appspot.com':
       return 'User-agent: *\nDisallow: /wordJson/\n'
     return 'User-agent: *\nDisallow: /'
 

tipitaka/app.yaml

@@ -61,7 +61,8 @@ skip_files:
 - ^(.*/)?app/scripts/.*
 - ^(.*/)?app/css/app\.css
 - ^(.*/)?app/css/tipitaka-latn\.css
-- ^(.*/)?pylib/romn/.*
+#- ^(.*/)?pylib/romn/.*
+- ^(.*/)?pylib/romn/.*\.xml
 - ^(.*/)?setup/.*
 - ^(.*/)?node_modules/.*
 - ^(.*/)?build/.*

tipitaka/app/partials/buttons.html

@@ -1,8 +1,8 @@
 <div class="floating-buttons">
- <div class="g-plusone" data-size="tall" data-href="http://tipitaka.online-dhamma.net/"></div>
- <div class="fb-like" data-href="http://tipitaka.online-dhamma.net/" data-send="true" data-layout="box_count" data-show-faces="true"></div>
+ <div class="g-plusone" data-size="tall" data-href="{$ tpkWebAppUrl $}"></div>
+ <div class="fb-like" data-href="{$ tpkWebAppUrl $}" data-send="true" data-layout="box_count" data-show-faces="true"></div>
  <div>
-  <a href="https://twitter.com/share" class="twitter-share-button" data-url="http://tipitaka.online-dhamma.net/" data-count="vertical">Tweet</a>
+  <a href="https://twitter.com/share" class="twitter-share-button" data-url="{$ tpkWebAppUrl $}" data-count="vertical">Tweet</a>
  </div>
 </div>
 <!-- Place this tag after the last +1 button tag. -->

tipitaka/mainweb.py

@@ -41,14 +41,21 @@
 )
 
 
+def RedirectToNewDomain(oldDomain, newDomain):
+  if web.ctx.host.split(':')[0] == oldDomain:
+    url = newDomain + urllib.quote(web.ctx.path.encode('utf-8')) + web.ctx.query
+    raise web.redirect(url)
+
 def commonTemplateValues(urlLocale, userLocale):
   i18n.setLocale(userLocale)
   template_values = {
 #    'serverEnv': 'ec2',
 #    'dicWebAppUrl': 'http://dictionary.sutta.org/',
     'serverEnv': 'appspot',
-#    'dicWebAppUrl': 'http://palidictionary.appspot.com/',
-    'dicWebAppUrl': 'http://dictionary.online-dhamma.net/',
+    'tpkWebAppUrl': 'http://epalitipitaka.appspot.com/',
+    'dicWebAppUrl': 'http://palidictionary.appspot.com/',
+#    'tpkWebAppUrl': 'http://tipitaka.online-dhamma.net/',
+#    'dicWebAppUrl': 'http://dictionary.online-dhamma.net/',
     'htmlTitle': u'',
     'userLocale': userLocale,
     'locales': json.dumps(i18n.locales),
@@ -62,13 +69,6 @@ def commonTemplateValues(urlLocale, userLocale):
 
 
 def commonPage(paliTextPath, translationLocale=None, translator=None, urlLocale=None):
-  if web.ctx.host.split(':')[0] == "epalitipitaka.appspot.com":
-    # redirect to new domain
-    url = "http://tipitaka.online-dhamma.net" + \
-          urllib.quote(web.ctx.path.encode('utf-8')) + \
-          web.ctx.query
-    raise web.redirect(url)
-
   userLocale = getLocale(urlLocale, web.ctx.env.get('HTTP_ACCEPT_LANGUAGE'))
   result = checkPath(web.ctx.path, urlLocale, paliTextPath,
                      userLocale, translationLocale, translator)
@@ -82,13 +82,6 @@ def commonPage(paliTextPath, translationLocale=None, translator=None, urlLocale=
 
 
 def commonMainPage(urlLocale=None):
-  if web.ctx.host.split(':')[0] == "epalitipitaka.appspot.com":
-    # redirect to new domain
-    url = "http://tipitaka.online-dhamma.net" + \
-          urllib.quote(web.ctx.path.encode('utf-8')) + \
-          web.ctx.query
-    raise web.redirect(url)
-
   userLocale = getLocale(urlLocale, web.ctx.env.get('HTTP_ACCEPT_LANGUAGE'))
   template_values = commonTemplateValues(urlLocale, userLocale)
   template_values['isIncludeAbout'] = True

tipitaka/pylib/xml2html.py

@@ -38,8 +38,10 @@ def getTranslationXmlUrl(action, translationLocale, translator):
   class XmlBlobKey(ndb.Model):
     blob_key = ndb.BlobKeyProperty()
 
-  xslt_root = etree.parse(blobstore.BlobReader(
-      XmlBlobKey.get_by_id('cscd/tipitaka-latn.xsl').blob_key))
+  #xslt_root = etree.parse(blobstore.BlobReader(
+  #    XmlBlobKey.get_by_id('cscd/tipitaka-latn.xsl').blob_key))
+  with open(getCanonXmlUrl('cscd/tipitaka-latn.xsl'), 'r') as f:
+    xslt_root = etree.parse(f)
 
   def paliXslt(action):
     return xslt(blobstore.BlobReader(XmlBlobKey.get_by_id(action).blob_key))

tipitaka/serviceweb.py

@@ -65,7 +65,7 @@ def GET(self, word):
 
 class robots:
   def GET(self):
-    if web.ctx.host == 'tipitaka.online-dhamma.net':
+    if web.ctx.host == 'http://epalitipitaka.appspot.com/':
       return 'User-agent: *\nDisallow: /html/\n'
     return 'User-agent: *\nDisallow: /'
 

tipitaka/setup/init4uploadToGAE.py

@@ -64,7 +64,7 @@ def uploadXmlsToBlobstore():
   for dirpath, dirnames, filenames in os.walk(romn_dir):
     for filename in filenames:
       path = os.path.join(dirpath, filename)
-      key = path[len(romn_dir)+1:]
+      key = path[len(romn_dir):]
       print('uploading %s ...' % key)
       with open(path, 'rb') as f:
         # Create the file
@@ -101,7 +101,7 @@ def uploadXmlsViaCustomRemoteBlobstoreAPI():
   for dirpath, dirnames, filenames in os.walk(romn_dir):
     for filename in filenames:
       path = os.path.join(dirpath, filename)
-      key = path[len(romn_dir)+1:]
+      key = path[len(romn_dir):]
       print('uploading %s ...' % key)
 
       """Python HTTP POST json-format data (payload is encoded with base64).