Merge lp:~zorba-coders/zorba/cleanup-guestbook.xq into lp:zorba

[Till Westmann]

remove unnecessary annotations and clean-up indentation

remove unnecessary annotations and clean-up indentation

[Till Westmann (tillw)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/cleanup-guestbook.xq-2012-06-14T21-30-02.066Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job cleanup-guestbook.xq-2012-06-14T21-30-02.066Z is finished. The final status was:

All tests succeeded!

[Zorba Build Bot (zorba-buildbot)]

Voting does not meet specified criteria. Required: Approve > 1, Disapprove < 1, Needs Fixing < 1, Pending < 1. Got: 1 Approve, 1 Pending.

[Ghislain Fourny (gislenius)]

review: Approve

[Zorba Build Bot (zorba-buildbot)]

Validation queue starting for merge proposal.
Log at: http://zorbatest.lambda.nu:8080/remotequeue/cleanup-guestbook.xq-2012-06-15T16-02-59.705Z/log.html

[Zorba Build Bot (zorba-buildbot)]

Validation queue job cleanup-guestbook.xq-2012-06-15T16-02-59.705Z is finished. The final status was:

All tests succeeded!

=== modified file 'test/unit/guestbook.xq'
--- test/unit/guestbook.xq	2012-05-03 12:31:51 +0000
+++ test/unit/guestbook.xq	2012-06-14 20:56:22 +0000
@@ -21,10 +21,10 @@
 
 declare namespace ann = "http://www.zorba-xquery.com/annotations"; 
 
-declare %ann:ordered collection guestbook:entries as node()*;
+declare collection guestbook:entries as node()*;
 declare variable $guestbook:entries as xs:QName := xs:QName("guestbook:entries");
 
-declare %ann:sequential function guestbook:list() 
+declare function guestbook:list() 
 {  
   let $entries := dml:collection($guestbook:entries)
   let $num_entries := fn:count($entries)
@@ -38,11 +38,11 @@
 };
 
 declare function guestbook:window() {
- let $x := 1 to 1000
- for tumbling window $w in $x
- start at $s when fn:true()
- end at $e when $e - $s eq 51
- return <window>{ $w }</window>
+  let $x := 1 to 1000
+  for tumbling window $w in $x
+  start at $s when fn:true()
+  end at $e when $e - $s eq 51
+  return <window>{ $w }</window>
 };