From ef0b45016373d65700ef6f7d494a200758b2e4c5 Mon Sep 17 00:00:00 2001 From: Daniel Veillard Date: Mon, 24 Mar 2003 13:57:34 +0000 Subject: [PATCH] fixed some problems related to #75813 about handling of Result Value Trees * xpath.c: fixed some problems related to #75813 about handling of Result Value Trees Daniel --- ChangeLog | 5 ++++ include/libxml/relaxng.h | 7 +---- result/HTML/attrents.html | 2 +- result/HTML/doc3.htm | 60 +++++++++++++++++++-------------------- result/HTML/wired.html | 26 ++++++++--------- xpath.c | 22 +++++++++++--- 6 files changed, 68 insertions(+), 54 deletions(-) diff --git a/ChangeLog b/ChangeLog index a903d1af..12acfb5d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Mar 24 14:56:01 CET 2003 Daniel Veillard + + * xpath.c: fixed some problems related to #75813 about handling + of Result Value Trees + Sun Mar 23 22:57:20 CET 2003 Daniel Veillard * uri.c: applied a set of patches from Lorenzo Viali correcting diff --git a/include/libxml/relaxng.h b/include/libxml/relaxng.h index fa891869..1b25c1f7 100644 --- a/include/libxml/relaxng.h +++ b/include/libxml/relaxng.h @@ -100,11 +100,6 @@ void xmlRelaxNGSetValidErrors(xmlRelaxNGValidCtxtPtr ctxt, xmlRelaxNGValidCtxtPtr xmlRelaxNGNewValidCtxt (xmlRelaxNGPtr schema); void xmlRelaxNGFreeValidCtxt (xmlRelaxNGValidCtxtPtr ctxt); int xmlRelaxNGValidateDoc (xmlRelaxNGValidCtxtPtr ctxt, - xmlDocPtr instance); -int xmlRelaxNGValidateStream(xmlRelaxNGValidCtxtPtr ctxt, - xmlParserInputBufferPtr input, - xmlCharEncoding enc, - xmlSAXHandlerPtr sax, - void *user_data); + xmlDocPtr doc); void xmlRelaxNGCleanupTypes (void); #endif /* __XML_RELAX_NG__ */ diff --git a/result/HTML/attrents.html b/result/HTML/attrents.html index 205430a6..ef57b457 100644 --- a/result/HTML/attrents.html +++ b/result/HTML/attrents.html @@ -1,4 +1,4 @@ -
+
diff --git a/result/HTML/doc3.htm b/result/HTML/doc3.htm index b823aea0..3621db60 100644 --- a/result/HTML/doc3.htm +++ b/result/HTML/doc3.htm @@ -124,23 +124,23 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
-
Headlines
Chat - with ABIT - 8:09PM PDT
Fixed - wallpaper - 11:47PM PDT
Seti - update - 10:40PM PDT
Judge - gives Napster the Boot!! - 2:10PM PDT
Ram +
Headlines
Chat + with ABIT - 8:09PM PDT
Fixed + wallpaper - 11:47PM PDT
Seti + update - 10:40PM PDT
Judge + gives Napster the Boot!! - 2:10PM PDT
Ram Sinks.. more cooling for small places. - 8:54AM - PDT
is - it [H]ard? - 9:19PM PDT
WiLd - CaSe!! - 1:40PM PDT
What - the heck is a Peltier?!?! - 10:05AM PDT
HELLO - EVERYONE!!! - 10:03PM PDT
BP6 + PDT
is + it [H]ard? - 9:19PM PDT
WiLd + CaSe!! - 1:40PM PDT
What + the heck is a Peltier?!?! - 10:05AM PDT
HELLO + EVERYONE!!! - 10:03PM PDT
BP6 Q3 server up and running.. - 2:06AM PDT

Sunday, July 30, 2000

Chat with ABIT
Posted by Holodeck2 @ 8:09PM - PDT  0 comments + PDT  0 comments  | top
I’m slacking a little. All game no work makes Holodeck2 a happy boy :-)

Wallpaper update: I got off my lazy ass and redid the 1280x1024 wall paper, now it has the 2 @@ -153,7 +153,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, July 27, 2000
Fixed wallpaper
Posted by Holodeck2 @ 11:47PM - PDT  5 comments + PDT  5 comments  | top
Get them now!!
This is a fixed bp6 wallpaper. In all the popular flavors, err... resolutions.

It's still the Intels Inside one with a spelling @@ -169,7 +169,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, Holodeck2,
[H]ard at work on the Brand Spanking New Wallpaper.



Seti update
Posted by Holodeck2 @ 10:40PM - PDT  5 comments + PDT  5 comments  | top

You like the pic?

Bp6 User Group Update:
Completed 61531 units!!
#168 on Top 200 All Groups (Going to pass CLRC in @@ -178,7 +178,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, a little slower).
Good job everyone!!

Check this page at least once a day for new stuff :-)


Judge gives Napster the Boot!!
Posted by Holodeck2 @ 2:10PM - PDT  0 comments + PDT  0 comments  | top
Good afternoon for everyone living in EST. I was going to post today morning but I didn't. Here's my story:
I woke up and thought about posting something but I @@ -190,7 +190,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, cry. and now I'm here :-)

Judge shuts Napster down


Check out the Goofy guy in the suit
He's Sean Fanning, founder of Napster.

Got news?? mailto:Holodeck2@home.com


Ram Sinks.. more cooling for small - places.
Posted by tim @ 8:54AM PDT  0 comments + places.
Posted by tim @ 8:54AM PDT  0 comments  | top
Need some cooling for your Videocard memory to get a little extra overclockability and FPS? Overclockers Hiedout Ram Sinks They just notified me of their new design.


@@ -198,7 +198,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, 2000
is it [H]ard?
Posted by Holodeck2 @ 9:19PM - PDT  0 comments + PDT  0 comments  | top
Big heatsinks are good, very good. The bigger the better.
You can never can have a too big of heatsink on a small chip (CPU, GPU, CHIPSET, etc)


My overclocked @@ -206,12 +206,12 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, watercooling next up :-)
(if you pry off the heatsink you void the warranty )

it was originally posted on [H]ardOCP
I’m not only a BP6er but also a [H]ardOCPer


WiLd CaSe!!
Posted by Holodeck2 @ 1:40PM - PDT  8 comments + PDT  8 comments  | top
Now this person really knows how to keep his case cool!!
Addin an 18" Fan!! WOW!!


Click to go to his site.


What the heck is a Peltier?!?!
Posted by Holodeck2 @ 10:05AM - PDT  6 comments + PDT  6 comments  | top
This is for all you people who wanted to know what a peltier is.

The quest fo the Perfect Peltier

Thanks to @@ -247,14 +247,14 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0,
Monday, July 24, 2000

BP6 Q3 server up and - running..
Posted by tim @ 2:06AM PDT  3 comments + running..
Posted by tim @ 2:06AM PDT  3 comments  | top
Setup a Q3 server for anyone wanting to practice in preparation for Quakecon.. Connect to bp6.dyndns.org default port. (SERVER: BP6 system, 256 MB ram, celeron 600 on a T3 connection)... Will be moved to another BP6 server eventually. This is only a temporary test of the system and net connection.
(BTW- there are a few bot's running around in there..)

BIOS Savior to the - rescue....
Posted by tim @ 12:53AM PDT  2 comments + rescue....
Posted by tim @ 12:53AM PDT  2 comments  | top
Do you sweat during the BIOS flashing procedure on your BP6 mobo? If so then this little gadget maybe worth a first look. It's called the "RD1 BIOS Savior" and it @@ -269,13 +269,13 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, July 17, 2000
How To Overclock
Posted by DareDevil @ 4:17PM - PDT  3 comments + PDT  3 comments  | top
For those of you who are new to overclocking, this guide will explain to you how to overclock, and what some of the terms are. Like 'FSB' (what the heck is that!? :0))

How To Overclock

The Cardcooler XT
Posted by DareDevil @ 4:11PM - PDT  1 comments + PDT  1 comments  | top
Wow! I am impressed! Nevermind keeping the CPU's cool... Keep your whole board cool!

Even if your not overclocking your system (or planning on it), this unit will @@ -285,11 +285,11 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, system.

Check this out!

http://www.brokenpixel.com/articles/coolerXT/cardcoolerXT_1.shtml

'Nerd Inside'
Posted by DareDevil @ 11:53AM - PDT  1 comments + PDT  1 comments  | top
We all need to have some fun sometimes! Check out this little web site that sells 'nerd' clothing ;) (I like the bibs in the Junior Hackerz section) :-Þ



Dual PSU Wiring diagram... (preview to - Part 1 Watercooling Project)
Posted by tim @ 12:43AM PDT  11 comments + Part 1 Watercooling Project)
Posted by tim @ 12:43AM PDT  11 comments  | top
When is comes to overclocking your system, cooling plays a big role. Powering all of those fans in your system can cause quite a strain on your PSU (Power Supply Unit). @@ -303,12 +303,12 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, dangerous and is not recommended unless you know what you are doing.

View Diagram 1 here.
View Diagram 2 here.

I used Tap-In Squeeze Connectors and 22 guage wire to connect the wires. You can get them at Radio Shack - Part# 64-3053 or click here.

+ Part# 64-3053 or click here.

Sunday, July 16, 2000

RAM Overclocking? Hmmmmm.
Posted by DareDevil @ 9:57AM - PDT  3 comments + PDT  3 comments  | top
I know we're pretty big overclockers here at BP6.Com so, this is a post of choice ;-) I've seen the question in the message boards, 'why can't I overclock any higher?' @@ -326,7 +326,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, came out on top? Read the review to find out....

Cooked RAM... Yummie

The ÐÐ.

CPU Guide
Posted by DareDevil @ 9:17AM - PDT  0 comments + PDT  0 comments  | top
A follow up on the 'Weekly CPU Prices', this guide will help you determine which cpu is best for you (and your board ;-)). Sent to me by Spanky, here's the @@ -335,11 +335,11 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, July 15, 2000
Weekly CPU Prices
Posted by DareDevil @ 11:29AM - PDT  2 comments + PDT  2 comments  | top
Wow, found this very useful! Wanting to buy a new CPU? Check out this detailed price list!

Click Here.

Thanks Sharky Extreme!

Fast Wallpapers
Posted by DareDevil @ 9:51AM - PDT  0 comments + PDT  0 comments  | top
FAST-MHz has released some wallpapers! Click here to view them. They come in sizes 800x600 1024x768 and 1152x864. If you have your desktop set at a @@ -356,7 +356,7 @@ eval("page" + id + " = window.open(URL, '" + id + "', 'toolbars=0, scrollbars=0, July 14, 2000
Hey There!
Posted by DareDevil @ 5:05PM - PDT  7 comments + PDT  7 comments  | top
Hey guys, just wanted to introduce myself, some of you may have already met me on the BP6.com board. I'll be posting up news from time to time now so, if you'd like, you diff --git a/result/HTML/wired.html b/result/HTML/wired.html index 2781ec5d..67a1913c 100644 --- a/result/HTML/wired.html +++ b/result/HTML/wired.html @@ -75,8 +75,8 @@ - - + +
   updated 10:15 a.m.  15.Oct.99.PDT @@ -127,10 +127,10 @@
SECTIONS -Business -Culture -Technology -Politics +Business +Culture +Technology +Politics WIRE SERVICE NEWS @@ -308,11 +308,11 @@ Issue 7.11
- Wired News staff

Contact us + Wired News staff

Contact us -

Wired News delivered
by PalmPilot,
Outlook Express,
In-Box Direct,
-or PointCast
 +

Wired News delivered
by PalmPilot,
Outlook Express,
In-Box Direct,
+or PointCast
@@ -322,7 +322,7 @@ or PointCast
Nomad's Land

Homeless, but ID'd, in Seattle
8:15 a.m. The city council approves a plan to track the homeless by a numbering system, saying it'll improve services. The implications worry privacy advocates, naturally. By Craig Bicknell.
in Politics
+
Nomad's Land

Homeless, but ID'd, in Seattle
8:15 a.m. The city council approves a plan to track the homeless by a numbering system, saying it'll improve services. The implications worry privacy advocates, naturally. By Craig Bicknell.
in Politics
@@ -330,7 +330,7 @@ or PointCast
@@ -340,7 +340,7 @@ or PointCast
@@ -362,7 +362,7 @@ Contruction workers in Berlin opened an old wound in the German psyche this week
  HITS & MISC.
 
 -
Other Top Stories

Wall Street Keeps Reeling
10:15 a.m. The Dow and Nasdaq suffer sizeable losses during the first half of Friday trading. Why? Wholesale prices are the highest this decade, and Greenspan is concerned about stock prices.
in Reuters

The Market's Madness
9:10 a.m. The bulls and the bears are in the midst of a Battle Royale, and all this turbulence is not a healthy thing. So say the experts.
in Reuters

'Want a Loan? What's Your Race?'
3:00 a.m. The Federal Reserve is in the middle of changing banking regulations to let banks collect data on the race, sex, religion, and national origin of their customers. By Declan McCullagh.
in Politics

Music Regs: A Bagful of Noise
3:00 a.m. The struggle to come up with a digital music standard that would minimize download piracy is pushing right up against the holiday gift-giving season. By Jennifer Sullivan.
in Business

Can't Beat 'Em? Green 'Em
3:00 a.m. High-tech companies are notoriously environmentally unfriendly, and a growing number of "Greenies" are trying to change things from the inside ... with varying results. By Chris Gaither.
in Technology

Y2K Cloud Over MS Office
3:00 a.m. Windows NT sales remain strong, but corporate clients are wary of upgrading to MS Office 2000. Analysts say that means strong, but not stunning, Microsoft earnings.
in Business

Med-Tech
Biochips for Custom Chemo
3:00 a.m. Different cancer patients need different medicine, but doctors can rarely determine the best match. New biochip technology promises chemotherapy tailored to a tumor's genetic make-up. By Kristen Philipkoski.
in Technology

High Stakes in Priceline Suit
3:00 a.m. It's not just another round of Redmond-bashing. A Priceline.com lawsuit against Microsoft's Expedia.com may have a big impact on how Net companies protect their business models. By Joanna Glasner.
in Business

Biodiversity Merges Online
3:00 a.m. The far-flung databases on global biodiversity get together to form one monster database. Soon the red-eyed tree frog will be eyeing those Swedish lingonberries. From the Environment News Service.
in Technology


Elsewhere Today

FCC: Hands-Off on Broadband
The Industry Standard

White House Lashes Out on Treaty
Lycos

Steve Jobs at 44
Time

Computers May Run on Gas
ZDNN

Much Is Free in the Wired World
The New York Times (Registration Required)

Melissa: I'm Baaaack
USA Today

Domain Owners Surrender Privacy
MSNBC

Dividing to Conquer in VC Game
The Washington Post

The Red Hat Diaries
Salon

Screensaver to Predict Climate
BBC News

+
Other Top Stories

Wall Street Keeps Reeling
10:15 a.m. The Dow and Nasdaq suffer sizeable losses during the first half of Friday trading. Why? Wholesale prices are the highest this decade, and Greenspan is concerned about stock prices.
in Reuters

The Market's Madness
9:10 a.m. The bulls and the bears are in the midst of a Battle Royale, and all this turbulence is not a healthy thing. So say the experts.
in Reuters

'Want a Loan? What's Your Race?'
3:00 a.m. The Federal Reserve is in the middle of changing banking regulations to let banks collect data on the race, sex, religion, and national origin of their customers. By Declan McCullagh.
in Politics

Music Regs: A Bagful of Noise
3:00 a.m. The struggle to come up with a digital music standard that would minimize download piracy is pushing right up against the holiday gift-giving season. By Jennifer Sullivan.
in Business

Can't Beat 'Em? Green 'Em
3:00 a.m. High-tech companies are notoriously environmentally unfriendly, and a growing number of "Greenies" are trying to change things from the inside ... with varying results. By Chris Gaither.
in Technology

Y2K Cloud Over MS Office
3:00 a.m. Windows NT sales remain strong, but corporate clients are wary of upgrading to MS Office 2000. Analysts say that means strong, but not stunning, Microsoft earnings.
in Business

Med-Tech
Biochips for Custom Chemo
3:00 a.m. Different cancer patients need different medicine, but doctors can rarely determine the best match. New biochip technology promises chemotherapy tailored to a tumor's genetic make-up. By Kristen Philipkoski.
in Technology

High Stakes in Priceline Suit
3:00 a.m. It's not just another round of Redmond-bashing. A Priceline.com lawsuit against Microsoft's Expedia.com may have a big impact on how Net companies protect their business models. By Joanna Glasner.
in Business

Biodiversity Merges Online
3:00 a.m. The far-flung databases on global biodiversity get together to form one monster database. Soon the red-eyed tree frog will be eyeing those Swedish lingonberries. From the Environment News Service.
in Technology


Elsewhere Today

FCC: Hands-Off on Broadband
The Industry Standard

White House Lashes Out on Treaty
Lycos

Steve Jobs at 44
Time

Computers May Run on Gas
ZDNN

Much Is Free in the Wired World
The New York Times (Registration Required)

Melissa: I'm Baaaack
USA Today

Domain Owners Surrender Privacy
MSNBC

Dividing to Conquer in VC Game
The Washington Post

The Red Hat Diaries
Salon

Screensaver to Predict Climate
BBC News

diff --git a/xpath.c b/xpath.c index 188b12d8..ee339de2 100644 --- a/xpath.c +++ b/xpath.c @@ -1694,8 +1694,10 @@ xmlXPathNodeSetAdd(xmlNodeSetPtr cur, xmlNodePtr val) { if (val == NULL) return; +#if 0 if ((val->type == XML_ELEMENT_NODE) && (val->name[0] == ' ')) return; /* an XSLT fake node */ +#endif /* @@ with_ns to check wether namespace nodes should be looked at @@ */ /* @@ -1752,8 +1754,10 @@ void xmlXPathNodeSetAddUnique(xmlNodeSetPtr cur, xmlNodePtr val) { if (val == NULL) return; +#if 0 if ((val->type == XML_ELEMENT_NODE) && (val->name[0] == ' ')) return; /* an XSLT fake node */ +#endif /* @@ with_ns to check wether namespace nodes should be looked at @@ */ /* @@ -3130,11 +3134,21 @@ xmlXPathObjectCopy(xmlXPathObjectPtr val) { case XPATH_XSLT_TREE: if ((val->nodesetval != NULL) && (val->nodesetval->nodeTab != NULL)) { + xmlNodePtr cur, top, tmp; + ret->boolval = 1; - ret->user = xmlDocCopyNode(val->nodesetval->nodeTab[0], - val->nodesetval->nodeTab[0]->doc, 1); - ret->nodesetval = xmlXPathNodeSetCreate( - (xmlNodePtr) ret->user); + top = xmlCopyNode(val->nodesetval->nodeTab[0], 0); + ret->user = top; + if (top != NULL) { + top->doc = (xmlDocPtr) top; + cur = val->nodesetval->nodeTab[0]->children; + while (cur != NULL) { + tmp = xmlDocCopyNode(cur, (xmlDocPtr) top, 1); + xmlAddChild(top, tmp); + cur = cur->next; + } + } + ret->nodesetval = xmlXPathNodeSetCreate(top); } else ret->nodesetval = xmlXPathNodeSetCreate(NULL); /* Deallocate the copied tree value */