diff --git a/README b/README
index 982bc286d7aeb4f86a3914e680ea2509c05da0ab..4b47ecf11e55cf05aaa2808db0e3e3f5b95c9ab6 100644
--- a/README
+++ b/README
@@ -1,6 +1,6 @@
lodspeakr - Linked Open Data Simple Publishing Kit
author: Alvaro Graves (alvaro@graves.cl)
-version: 20120316
+version: 20120318
Simplest Installation
---------------------
diff --git a/doc/examples/components/services/people/html.template b/doc/examples/components/services/people/html.template
index 43c17e2cad4fd64a360c78d67f8b9d6bb93f83a9..f072a11adbc9b118fcc8e92705c29044eb6989d4 100644
--- a/doc/examples/components/services/people/html.template
+++ b/doc/examples/components/services/people/html.template
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in base.ns %}xmlns:{{i}}="{{ns}}"
+<html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in lodspk.ns %}xmlns:{{i}}="{{ns}}"
{%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
<head>
<title>TWC People directory</title>
diff --git a/doc/examples/components/services/peopleByName/html.template b/doc/examples/components/services/peopleByName/html.template
index 982cdd8d7e34a5bacc05729c665bddec9e314aba..15462828d4dfa96b37a24866b3b2d18001b0b24b 100644
--- a/doc/examples/components/services/peopleByName/html.template
+++ b/doc/examples/components/services/peopleByName/html.template
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in base.ns %}xmlns:{{i}}="{{ns}}"
+<html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in lodspk.ns %}xmlns:{{i}}="{{ns}}"
{%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
<head>
<title>TWC People directory</title>
diff --git a/doc/examples/originalComponents/services/instances/html.template b/doc/examples/originalComponents/services/instances/html.template
index 1dc603e143d3c06eb8b431ed15b784cb342f57dc..d9bf5b429fc01622699f35a82949e368d8a856a9 100644
--- a/doc/examples/originalComponents/services/instances/html.template
+++ b/doc/examples/originalComponents/services/instances/html.template
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in base.ns %}xmlns:{{i}}="{{ns}}"
+ <html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in lodspk.ns %}xmlns:{{i}}="{{ns}}"
{%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
<head>
<title>Instances of {{lodspk.args.arg0}}</title>
diff --git a/doc/examples/originalComponents/services/namedGraphs/html.template b/doc/examples/originalComponents/services/namedGraphs/html.template
index e6109aef46e74c43bb6ff9c3ba2aa78c92c27881..f1c287312a104708130948cd3c0f6832a5b23efe 100644
--- a/doc/examples/originalComponents/services/namedGraphs/html.template
+++ b/doc/examples/originalComponents/services/namedGraphs/html.template
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML+RDFa 1.0//EN"
"http://www.w3.org/MarkUp/DTD/xhtml-rdfa-1.dtd">
- <html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in base.ns %}xmlns:{{i}}="{{ns}}"
+ <html xmlns="http://www.w3.org/1999/xhtml" {% for i, ns in lodspk.ns %}xmlns:{{i}}="{{ns}}"
{%endfor%}version="XHTML+RDFa 1.0" xml:lang="en">
<head>
<title>Named Graphs</title>
diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Explode.php b/lib/Haanga/lib/Haanga/Extension/Filter/Explode.php
new file mode 100644
index 0000000000000000000000000000000000000000..7e6deae3c607a0bf519281e00e71abd01867bc9c
--- /dev/null
+++ b/lib/Haanga/lib/Haanga/Extension/Filter/Explode.php
@@ -0,0 +1,13 @@
+<?php
+
+class Haanga_Extension_Filter_Explode
+{
+ static function generator($compiler, $args)
+ {
+ if (count($args) != 2) {
+ $compiler->Error("Explode only needs two parameter");
+ }
+
+ return hexec('explode', $args[1], $args[0]);
+ }
+}
diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Pop.php b/lib/Haanga/lib/Haanga/Extension/Filter/Pop.php
new file mode 100644
index 0000000000000000000000000000000000000000..5d3914a415d0ed10eded2a564030ccb15d786581
--- /dev/null
+++ b/lib/Haanga/lib/Haanga/Extension/Filter/Pop.php
@@ -0,0 +1,13 @@
+<?php
+
+class Haanga_Extension_Filter_Pop
+{
+ static function generator($compiler, $args)
+ {
+ if (count($args) != 1) {
+ $compiler->Error("Pop only needs two parameter");
+ }
+
+ return hexec('array_pop', $args[0]);
+ }
+}
diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Uripath.php b/lib/Haanga/lib/Haanga/Extension/Filter/Uripath.php
new file mode 100644
index 0000000000000000000000000000000000000000..1de855ab2bc46ae82f823d72f14c89826de9c9f3
--- /dev/null
+++ b/lib/Haanga/lib/Haanga/Extension/Filter/Uripath.php
@@ -0,0 +1,9 @@
+<?php
+
+class Haanga_Extension_Filter_Uripath
+{
+ static function generator($cmp, $args)
+ {
+ return hexec('parse_url', $args[0], hconst('PHP_URL_PATH'));
+ }
+}
diff --git a/lib/Haanga/lib/Haanga/Extension/Filter/Urischeme.php b/lib/Haanga/lib/Haanga/Extension/Filter/Urischeme.php
new file mode 100644
index 0000000000000000000000000000000000000000..2fc5457f344c1fd4d065de4a9d183989af397c43
--- /dev/null
+++ b/lib/Haanga/lib/Haanga/Extension/Filter/Urischeme.php
@@ -0,0 +1,9 @@
+<?php
+
+class Haanga_Extension_Filter_Urischeme
+{
+ static function generator($cmp, $args)
+ {
+ return hexec('parse_url', $args[0], hconst('PHP_URL_SCHEME'));
+ }
+}