No more Makefiles. Use go command to build and install. Temporarily removed dependency of external go-charset package. It is incompatible with new Go versions and is not updated by the author. We should find a replacement for it. This may cause problems with xml files supplied in non-utf8 encodings.
This commit is contained in:
parent
6e76dc96aa
commit
b14dd79d8d
10
Makefile
10
Makefile
|
@ -1,10 +0,0 @@
|
|||
# This work is subject to the CC0 1.0 Universal (CC0 1.0) Public Domain Dedication
|
||||
# license. Its contents can be found at:
|
||||
# http://creativecommons.org/publicdomain/zero/1.0/
|
||||
|
||||
include $(GOROOT)/src/Make.inc
|
||||
|
||||
TARG = github.com/jteeuwen/go-pkg-xmlx
|
||||
GOFILES = document.go node.go entitymap.go
|
||||
|
||||
include $(GOROOT)/src/Make.pkg
|
15
README
15
README
|
@ -12,20 +12,7 @@
|
|||
DEPENDENCIES
|
||||
================================================================================
|
||||
|
||||
goinstall go-charset.googlecode.com/hg/charset
|
||||
|
||||
================================================================================
|
||||
USAGE
|
||||
================================================================================
|
||||
|
||||
Getting the package up and running is simple enough. This should also
|
||||
automatically take care of any dependencies for you:
|
||||
|
||||
$ goinstall github.com/jteeuwen/go-pkg-xmlx
|
||||
|
||||
Using it:
|
||||
|
||||
import xmlx "github.com/jteeuwen/go-pkg-xmlx"
|
||||
none
|
||||
|
||||
================================================================================
|
||||
API
|
||||
|
|
|
@ -26,7 +26,7 @@ package xmlx
|
|||
|
||||
import (
|
||||
"bytes"
|
||||
"code.google.com/p/go-charset/charset"
|
||||
//"code.google.com/p/go-charset/charset"
|
||||
"encoding/xml"
|
||||
"errors"
|
||||
"fmt"
|
||||
|
@ -82,9 +82,9 @@ func (this *Document) SelectNodes(namespace, name string) []*Node {
|
|||
func (this *Document) LoadStream(r io.Reader) (err error) {
|
||||
xp := xml.NewDecoder(r)
|
||||
xp.Entity = this.Entity
|
||||
xp.CharsetReader = func(enc string, input io.Reader) (io.Reader, error) {
|
||||
return charset.NewReader(enc, input)
|
||||
}
|
||||
//xp.CharsetReader = func(enc string, input io.Reader) (io.Reader, error) {
|
||||
// return charset.NewReader(enc, input)
|
||||
//}
|
||||
|
||||
this.Root = NewNode(NT_ROOT)
|
||||
ct := this.Root
|
||||
|
|
Loading…
Reference in New Issue