OpenPKG CVS Repository
http://cvs.openpkg.org/
____________________________________________________________________________
Server: cvs.openpkg.org Name: Ralf S. Engelschall
Root: /v/openpkg/cvs Email: [EMAIL PROTECTED]
Module: openpkg-src Date: 28-May-2008 20:59:13
Branch: HEAD Handle: 2008052819591100
Modified files:
openpkg-src/drupal drupal.patch drupal.spec
Log:
support prepending an XML prolog: mainly for ENTITY declarations
Summary:
Revision Changes Path
1.16 +29 -6 openpkg-src/drupal/drupal.patch
1.259 +1 -1 openpkg-src/drupal/drupal.spec
____________________________________________________________________________
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.patch
============================================================================
$ cvs diff -u -r1.15 -r1.16 drupal.patch
--- openpkg-src/drupal/drupal.patch 23 May 2008 18:26:23 -0000 1.15
+++ openpkg-src/drupal/drupal.patch 28 May 2008 18:59:11 -0000 1.16
@@ -330,7 +330,7 @@
--- /dev/null 2008-05-02 21:08:21 +0200
+++ sites/all/modules/img_assist/img_assist_popup.js 2008-05-02 21:05:56
+0200
@@ -0,0 +1,20 @@
-+/* $Id: drupal.patch,v 1.15 2008/05/23 18:26:23 rse Exp $ */
++/* $Id: drupal.patch,v 1.16 2008/05/28 18:59:11 rse Exp $ */
+
+function launch_popup(nid, mw, mh) {
+ var ox = mw;
@@ -578,22 +578,31 @@
in arbitrary directories.
3. Finally, do not create a new DOM and output it as XML. Instead directly
output the transformed XML in order to get rid of the <?xml...?>
declaration.
+4. Additionally, support an optional XML content prolog (mainly
+ for loading ENTITY definitions which cannot be done via XSD and XSLT)
Index: sites/all/modules/xmlcontent/xmlcontent.module
--- sites/all/modules/xmlcontent/xmlcontent.module.orig 2007-03-14
22:59:59 +0100
-+++ sites/all/modules/xmlcontent/xmlcontent.module 2008-05-23 20:23:31
+0200
-@@ -39,7 +39,9 @@
++++ sites/all/modules/xmlcontent/xmlcontent.module 2008-05-28 20:55:11
+0200
+@@ -39,7 +39,16 @@
return t('Allows users to post XML node content and get it
transformed through a configured XSLT script');
case 'process':
- $xslt_path = drupal_get_path('module', 'xmlcontent'). '/' .
variable_get("xmlcontent_xslt_path_$format", '');
++ $prolog_path = variable_get("xmlcontent_prolog_path_$format", '');
++ if ($prolog_path != "") {
++ if (substr($prolog_path, 0, 1) != "/")
++ $prolog_path = drupal_get_path('module', 'xmlcontent') . '/'
. $prolog_path;
++ $prolog = file_get_contents($prolog_path);
++ $text = $prolog . $text;
++ }
+ $xslt_path = variable_get("xmlcontent_xslt_path_$format", '');
+ if (substr($xslt_path, 0, 1) != "/")
+ $xslt_path = drupal_get_path('module', 'xmlcontent') . '/' .
$xslt_path;
return _xmlcontent_transform($text, $xslt_path);
case 'settings':
-@@ -72,7 +74,7 @@
+@@ -72,7 +81,7 @@
}
// Does the input format of this node use XML Content filter?
$format = filter_resolve_format($node->format);
@@ -602,7 +611,7 @@
if ($module != 'xmlcontent') {
return;
}
-@@ -83,7 +85,10 @@
+@@ -83,7 +92,10 @@
return;
}
@@ -614,7 +623,21 @@
if (!is_file($schema_path) && ($validation == 'xsd' or $validation ==
'rng')) {
$schema_path = null;
watchdog( 'xmlcontent', t('Validation required but no schema
file'), WATCHDOG_WARNING );
-@@ -242,10 +247,8 @@
+@@ -156,6 +168,13 @@
+ '#collapsible' => TRUE,
+ '#collapsed' => FALSE,
+ );
++ $form['xmlcontent']["xmlcontent_prolog_path_$format"] = array(
++ '#type' => 'textfield',
++ '#title' => t('Optional XML Prolog File Path'),
++ '#default_value' => variable_get("xmlcontent_prolog_path_$format", ''),
++ '#field_prefix' => drupal_get_path('module', 'xmlcontent'). '/',
++ '#description' => t('The file path to the optional XML prolog,
prepended to the XML content before processing.'),
++ );
+ $form['xmlcontent']["xmlcontent_xslt_path_$format"] = array(
+ '#type' => 'textfield',
+ '#title' => t('XSLT Script File Path'),
+@@ -242,10 +261,8 @@
}
// Transform
@@ .
patch -p0 <<'@@ .'
Index: openpkg-src/drupal/drupal.spec
============================================================================
$ cvs diff -u -r1.258 -r1.259 drupal.spec
--- openpkg-src/drupal/drupal.spec 27 May 2008 19:03:58 -0000 1.258
+++ openpkg-src/drupal/drupal.spec 28 May 2008 18:59:11 -0000 1.259
@@ -213,7 +213,7 @@
Group: CMS
License: GPL
Version: %{V_drupal}
-Release: 20080527
+Release: 20080528
# package options
%option with_mysql yes
@@ .
______________________________________________________________________
OpenPKG http://openpkg.org
CVS Repository Commit List [email protected]
