|
From: backer <eb...@us...> - 2004-08-12 18:34:34
|
Update of /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/generation In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7138/java/net/sf/dynxform/container/cocoon/generation Modified Files: AbstractFormGenerator.java TranslatedFormCacheGenerator.java Log Message: renamed spp param to guid Index: TranslatedFormCacheGenerator.java =================================================================== RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/generation/TranslatedFormCacheGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** TranslatedFormCacheGenerator.java 11 Aug 2004 17:32:50 -0000 1.2 --- TranslatedFormCacheGenerator.java 12 Aug 2004 18:34:06 -0000 1.3 *************** *** 39,43 **** * ID form */ ! private String spp = null; /** --- 39,43 ---- * ID form */ ! private String guid = null; /** *************** *** 93,97 **** } } ! spp = par.getParameter("spp", ""); cacheDir = par.getParameter("cache-dir", ""); formsDir = par.getParameter("forms-dir", ""); --- 93,97 ---- } } ! guid = par.getParameter("guid", ""); cacheDir = par.getParameter("cache-dir", ""); formsDir = par.getParameter("forms-dir", ""); *************** *** 103,107 **** } } ! if (spp == null || spp.trim().length() == 0 || cacheDir == null || cacheDir.trim().length() == 0) { useCache = false; } --- 103,107 ---- } } ! if (guid == null || guid.trim().length() == 0 || cacheDir == null || cacheDir.trim().length() == 0) { useCache = false; } *************** *** 112,116 **** if (!checkCache()) { if (log.isDebugEnabled()) { ! log.debug("The translation of form \""+spp+"\" does not exist in cache."); } inputSource = resolver.resolveURI(src); --- 112,116 ---- if (!checkCache()) { if (log.isDebugEnabled()) { ! log.debug("The translation of form \""+guid+"\" does not exist in cache."); } inputSource = resolver.resolveURI(src); *************** *** 126,132 **** new File(cacheDir + languageId + '/').mkdirs(); if (log.isDebugEnabled()) { ! log.debug("Store form in cache - \""+cacheDir + languageId + '/'+ spp + ".xml"+"\"."); } ! final FileOutputStream fos = new FileOutputStream(cacheDir + languageId + '/'+ spp + ".xml"); fos.write(byteArr); fos.close(); --- 126,132 ---- new File(cacheDir + languageId + '/').mkdirs(); if (log.isDebugEnabled()) { ! log.debug("Store form in cache - \""+cacheDir + languageId + '/'+ guid + ".xml"+"\"."); } ! final FileOutputStream fos = new FileOutputStream(cacheDir + languageId + '/'+ guid + ".xml"); fos.write(byteArr); fos.close(); *************** *** 139,145 **** } else { if (log.isDebugEnabled()) { ! log.debug("The translation of form \""+spp+"\" lie in cache."); } ! inputSource = new FileSource(cacheDir + languageId + '/'+ spp + ".xml"); } } --- 139,145 ---- } else { if (log.isDebugEnabled()) { ! log.debug("The translation of form \""+guid+"\" lie in cache."); } ! inputSource = new FileSource(cacheDir + languageId + '/'+ guid + ".xml"); } } *************** *** 191,195 **** */ private boolean checkCache() { ! final File cachedFile = new File(cacheDir + languageId + '/'+ spp + ".xml"); if (formsDir == null || formsDir.trim().length() == 0) { if (log.isDebugEnabled()) { --- 191,195 ---- */ private boolean checkCache() { ! final File cachedFile = new File(cacheDir + languageId + '/'+ guid + ".xml"); if (formsDir == null || formsDir.trim().length() == 0) { if (log.isDebugEnabled()) { *************** *** 198,202 **** return false; } ! final File formFile = new File(formsDir + '/'+ spp + ".xml"); boolean retVal = false; if (cachedFile.exists() && formFile.exists()) { --- 198,202 ---- return false; } ! final File formFile = new File(formsDir + '/'+ guid + ".xml"); boolean retVal = false; if (cachedFile.exists() && formFile.exists()) { Index: AbstractFormGenerator.java =================================================================== RCS file: /cvsroot/dynxform/dynxform/src/java/net/sf/dynxform/container/cocoon/generation/AbstractFormGenerator.java,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AbstractFormGenerator.java 11 Aug 2004 17:32:50 -0000 1.2 --- AbstractFormGenerator.java 12 Aug 2004 18:34:06 -0000 1.3 *************** *** 51,58 **** } final Form form = getForm(targetForm, ! (String) request.getAttribute("spp"), RequestHelper.isReloadForm(request)); if (log.isDebugEnabled()) { ! log.debug("Set target form spp:" + ((form != null) ? form.getGuid() : null)); } --- 51,58 ---- } final Form form = getForm(targetForm, ! (String) request.getAttribute("guid"), RequestHelper.isReloadForm(request)); if (log.isDebugEnabled()) { ! log.debug("Set target form guid:" + ((form != null) ? form.getGuid() : null)); } |