CVS log for Amaya/annotlib/ANNOTtools.c

Request diff between arbitrary revisions

Integration of Yusuke Ishii patches
Irene

Typo
Irene

Fix warning and problems with 4 bits machines.
Irene

Prevent a crash with annotations
(not done yet RDF parser doesn't manage internationalized URIs)
Irene

Fixing some MacOS warnings.
+ prevent a crash with redirect (need some improvement).
Irene

Update the copyrigh.
Irene

Improve the management of mandatory attributes in the GTK version.
+ fix some bugs with the set of structure checking.
Irene

Annotation icons were not displayed when their paths include spaces.
Irene

-Update to redland 0.9.16
-New bookmark operations (separators, collections, move) and bug fixes.
-Opening multiple bookmark files.

You won't be able to compile unless you install the latest redland:
   http://www.redland.opensource.ac.uk/dist/source/redland-0.9.16.tar.gz

and follow the usual instructions for compiling Amaya with redland.
Windows won't compile after this commit until I update the makefiles.

-jk

JK: Support for rdfs:seeAlso associated to topics and bookmarks (browsing
only, no editiing or GUI).  Partial support for nicknames.

JK: Removed IV comment as that line of code was obsolete after
the I18N cleanup.

Fix a crash in annotations and reset the Stop button when an annotation
is created.
Irene

Fix warnings (unitialized variables).
Irene

Removing _I18N_ within amaya and annotlib directories
Extending the copyright to 2004
Adding needed convertions utf-8 to the default charset.
Irene

JK: Fixed a compilation error when compiling wo bookmks

JK: Changes for opening multiple bookmark files (temp. disabled
while fixing some model things)

Rename flags _WINDOWS by _WINGUI
+ the flag _WINDOWS must be used only for windows specific code.
+ the flag _WINGUI must be used only for old windows gui stuff.

S. GULLY

compilation error fix when bookmarks enable

This is the Amaya C++ version : ie amaya uses now g++ (c++ version of gcc)

WARNING:
Before compilation do :
    - On debian just install g++ : "apt-get install g++"
    - A cvs update into libwww directory because there is a expat header to update.
    - "rm -rf *"
    - "../configure [options...]"

S. GULLY

JK: fixed a memory leak reported by insure

JK: code cleanup

JK: The mime type for the body of an annotation was text/html
but we were actually using xhtml. Changed it to application/xhtml+xml
(let's see if the other clients understand it!).

JK: Changed the code for having bookmarks belong to more than one topic.

Must specify the namespace on the attributes added in rev 1.125
RRS

When updating (via PUT) an Annotation or a Reply, the URI should
be given explicitly in the request body, along with the body URI.
More detail posted in
http://lists.w3.org/Archives/Public/www-annotation/2003JanJun/0102.html
Ralph

JK: Some additional list search functions (used in bookmarks)

Add time zone designator to the date strings we generate
(see bug reported to www-annotations@w3.org).  Parse
NOTE-datetime formats, including fractional seconds
and optional timezone designator.

JK: Generalized the thread sort algorithm for using it with bookmarks.

JK: The ns wasn't added anymore to the annotation body when saving/posting
an annotation.

JK: Make annotations work with generic XML documents. N.B.,
we still need to add NS to XPointers to be 100% compliant.

JK: first try at using temporary names for downloaded images.
The pImage structure now has an additional field, tempfile, that gives
the filename we use.
The real name, minux the extesion, is used as a prefix of the
temporary name. The function to compute those names came from the
annotlib and is now moved to AHTURLtools.c
I haven't yet tested this under Windows.

- GL : add Opacity, glyph index caching, picture caching
   Rewrite Text engine now using textures, Scroll engine is cleaner

- GTK : Add stix, fontconfig load, zoom on CRTL + mouse wheel
        Need _FONTCONFIG and _STIX
        Config files are in "config" subdirectory
- Add Base64 images decoding (alpha, need _BASE64)
- Fix warnings in code

JK: Changed the algorithm for finding the source document when changing
an annotationt type

JK: Removed a compiler portability warning.

JK: A patch for fixing the bug that didn't let change annotation types or
titles in remote annotations when replying to a remote annotation reply.

JK: The thread list wasn't updated when Changing the type of a reply.

Avoid a possible stack overwrite when a local file URI has a fragment
that is long.  E.g. an annotation body URI with an XPointer.
RRS

Rename Iso functions + bug fix in XHTML doctype.
Irene

JK: preparing the work to solve the parameter bug

JK: First try at fixing the missing list item symbols (but return
works erratically).

- Allow annotation bodies to be of type text, svg, and mathml, as well
  as XHTML.
- Send the correct content type when publishing an annotation (we were
  always using text/html)

-jose

JK: fixing the thread refresh bug on windows

RDF now deprecates the omission of the namespace qualifier on resource=
RRS

JK: Amaya would crash when making a local annotation + a local reply, then
closing the reply + reloading the annotations.
Enhanced the code to detect if an annotation is already downloaded

JK: Improve the detection of orphan annotations.

JK: Put a "?" symbol in front of orphan threads

JK: make the source document raise the annotated document if this
doc is an annotation or reply.

JK: Posting an annotation that had local replies or annotations attached to it
didn't update the local metadata to point to the new URL.
The reverse link from the metadata "source_doc" didn't work on annots on
annots.

JK: Merge remote + local replies + resort.

JK: Sorting annotation replies by date

JK: Fixed a danling memory read as reported by insure :)

RRS: Be less scared.  Fix a crash when sorting reply threads that
have more than one reply.

JK: Be scared! A commit dans l'etat so that I don't lose my job if something
happens to my laptop.
.
Adaption of JamieZ's thread message sorting algorithm.
Date sort of threads (code written for the old sort algorithm, but not yet
adapted to the new algorithm).
Some changes for annotations/thread deletes, updates, posts.
Some bugs remain, but I'm working on them.
Compiles without problems with the ANNOT_ON_ANNOT option. No time to verify
if there's a compiler problem without this flag. Feel free to fix and
commit those changes if that situation happens (or even rollback).

JK: Annotation replies bug fixes, enhancements.
Things missing: sort the threads by date (sorted by reply to done)
Update the local annotations annotates and replies-to info after a post.
UI: show annotations in same window when browsing.

I18N clean up
Irene

When an annotation view was closed without saving the annotation the
local index was being updated.  When an annotation was deleted before
saving it, a bogus local annotation was added to the index.

Fix typo that broke replies; RDF had invalid XML syntax.

Don't create an orphanned annotation when the server returns RDF data
whose subject is something other than an Annotation (e.g. the authenticated
creator of an annotation).  This is a more complete fix to the problem
that was being addressed by AHTrdf2annot.c rev 1.28.2.1.

JK: Annot on annot bug fix. The inreply to and resource properties were
being stored as literals instead of attribute values.

JK: Removing compiler warnings when compiling without threads.
Saving annot->author and annot->title using UTF-8 (plus some untested
code for I18N for the same cases).

JK: Fixing compiler warnings. Adding UTF8 support for document title +
author metadata fields.

JK: Adding the thread reply schema

JK: Rewrote the reload behavior of annotations that have threads to have
an homogeneous behavior. Activated the close document X button so that
all resources are freed. Fixed related memory bugs. Changed the way that
threads are built in the annot window to take into account the server
download.

JK: Several annotation/annotation and thread bug fixes (mostly for local
annotations).

JK: Bug fix: Changing the annotation type caused a crash.
Changing annotation types didn't work on threads.

Full support of ASCII in the I18N Unix version
Irene

JK: Bug fix: When downloading an annotation, the new HTML tree was being
added as the child of the Annotation/Body/HTML element. If we saved such
a document, this resulted in a duplication of the HTML elements.
Preparing the work for using the XHTML parser and saving annotations with
a correct charset (UTF-8 for the moment).

JK: A patch for uniformizing the use of file:// regardless of the platform.
This should fix up bugs we had when we wrongly added the file: prefix without
converting the rest of the URL under Windows platform. The patch should be
backwards compatible with existing annotations.
New URLs under Windows will now read: file:///drive:path.

JK: Annotation threads. Made reload of an annotation doc + threads work.
Now showing the title of annotation + author's name + last modif. date
in each thread item. Make new thread items be added at the end of the
thread, rather than as the first child (still needs work to sort the
threads). Make selection work on the desc item, rather than on the
thread item. Some bug fixes.

JK: fixing a compiler error (when not using ANONT_ON_ANNOT)

JK: Allow to add a reply on any window, not just doc window 2.

JK: still, another make bug

JK: Saved threads can now be reloaded.

JK: Annotations/annotations.
Show the title of the annotation that's being annotated or its URL if
not found.
Automatically give a title to an annotation (Annotation of... Reply to...)
when creating a new annotation. User can modify it later.

JK: Annotation titles + code cleanup

JK: Thread changes... now locally saving and downloading annotations
(in progress).

Unicode stuff + code clean up
Irene

JK: protecting thru ifdefs my threading work.
Add in Options -DANNOT_ON_ANNOT to activate.

JK: Syncing the annotlib with Vincent's last commit

JK: Early commit of the annotation thread code.

Removing the macro TEXT ()
Irene

JK: missing file in my last commit (removes other warnings)

JK: Fixing compiler warnings
Annotlib: code cleaning (rewrite of all the include statements + use of
annotlib.h)
Changed the Amaya version and date.

When POSTing an annotation whose context starts at the same
position as an existing annot Amaya failed to update the
href when the POST reply arrived.
RRS

JK: We're now saving the full URL for Xpointers and not just the XPointer
fragment.

Updating the documentation + version 4.2.2
Irene

JK: changed a commentary

JK: local names weren't converted into WWW ones under Windows (a problem
with an evaluation).

JK: fixed the problems when annotating local file names which have spaces,
or when Amaya is stored in a directory with spaces (Windows)

JK: Annot_GetHTMLRoot() ... new function for retrieving the
HTML root inside an Annotation document... ala GetMainRoot()

JK: Removed all the compiler warnings that appear when compiling with
-Wall and -O2.
The remote raise source_doc and delete callbacks weren't checking the
return status code.

JK: the filter could show types of invisible annotations.

JK: The filters were showing the invisible and orphan annotations.
Many related bugs solved, some few remaining.

JK: Rewrote the annot filters functionality so that they are displayed
automatically. New three state indicator "visible, hidden, partially visible".
Some code cleaning tasks need to be done yet (re AnnotDelete).

JK: AnnotFilter_update... new function by ralph

Merge exp_AnnotAuthUser branch into main branch.  This will display three
additional fields in the annotation metadata if the server supplies them,
else nothing will display.
RRS

Experimental support for displaying authenticated user information
from an Annotea service.  This adds three fields to the annotation
metadata and changes some interfaces in ANNOTschema.  This is
checked-in to a branch tagged exp_AnnotAuthUser so that Jose can
look it over and decide whether to merge it.
RRS

Capture the namespace name of the annotation schema from annot.schemas.
Relocate all other hard-coded namespace names to annotlib.h to make
future maintenance easier.

Bugfix: avoid a case of double-freeing memory when searching
for an annotation xlink in the document that isn't there.
RRS

JK: We couldn't always get the title of an HTML document.

Mark orphanned annotations (those whose context XPointer no longer
selects an existing element) and bodyless annotations and write
a log of these in APP_TMPDIR.  This code is on a branch tagged
exp_AnnotErrLog for purposes of concurrent development.
RRS

Enable annotations of annotations with -DANNOT_ON_ANNOT
These can now be stored, but they are not yet displayed;
some XPointer work is needed.
RRS

Use {APP_DIR,THOTDIR/config}/annot.schemas to configure the annotation
schemas instead of ANNOT_SCHEMA from the registry.  Fix a bug in DELETE;
we were sending the wrong URI.  Request application/xml instead of
application/rdf when querying and reading annotations.  Drop the old
"positive comment", "flame", and "(comment)" fallback types.  Establish
basic infrastructure for enabling locally specific annotation subtypes.
RRS

Handle newly created local annotations without a segv.  Local annotations
have a file: URI unless they were newly created this session, in which
case they don't have a URI.

Bugfix: when an annotation is deleted, update the filter list properly.
RRS

JK: Bug fix: the schema types were being erased when deleting the filters.
Enhancement: if you create an annotation and then quit without saving it,
the annotation is deleted.
In progress: the delete annotation doesn't clear yet all the metadata when
the annotation document is open. It's a problem of calling TtaCloseDocument
rather than CloseDocument.

JK: Cleaned the post_callback cleanup functions, which were not
always making the correct assumptions.
When posting an annotation that hadn't been saved, the body was being
generated in an incorrect way. This had bad side-effects while computing the
content-length and house cleaning.
Adding some protection so that asynchronous annotations don't arrive after
the source document has disappeared.

Take care not to free RDF resources when freeing the annotation
filter lists.

Fix two bugs found by Jose having to do with annotation types:
1. segv when posting annotation due to mis-handling of type name
2. segv when setting type filters due to mis-handling of type pointer

JK: The annotation is now placed as the first child of MathML and SVG
fragments.
Changes so that we can annotate a single MathML/SVG documents.

JK: File cleaning: removed two schemas we were not using.
Bug fixes: List_delAll wasn't freeing the memory associated to objects.
The func. API now includes an argument for specifying the function that should
free an object.

JK: Code simplication proposed by Ralph. Now using AM_GetFileSize from
AHTURLTools.c (functionality was being repeated by two functions).

JK: If the user clicked on the reverse link from the annotation to the
soure doc, and if the annotation was stored locally, the annotated text
wasn't being selected.
Code simplification: moved all the code in the diverse functions that
were concatenating file:// to a URL to ANNOT_MakeFileURL.

JK: Bug fixes/enhancements to the remote protocols
Using now a specific anotation element (XLink, declared in XLink.S),
instead of piggy-backing on an HREF one (with the IsAnnotation attribute).
This allows to insert annotations anywhere on a document, without worrying
about the DTD and other goodies.

Make local filters work again.  API change to AnnotFilter_add.

JK: Making a new annotation without loading the local ones would erase
the previous local annotations.
Fixes so that the filters are updated after a delete

Don't segv when posting an annot before reading a schema.

Don't segv when saving the first annotation before loading a schema.

Fix undefined global from previous patch; missed this on Windows build.

Use 'Comment' rather than (undefined) 'comment' for default annotation type.
Fix bug when updating local annotation index that caused "#" to be replicated
in annotation type.
Fix display of annotation type that is not from the default schema.
Preliminary support for better selection of annotation type.

JK: Update the local master index only for local annotations.
Code cleaning: removed all the non-used legacy functions.

JK: Delete of local annotations

JK: Fixed the bug introduced by the reverse linking mechanism and the
changes in the handling of "/".
Some initial code for deleting annotations.

JK: code changes for being able to post/save a remote file

JK: Preparing the work for using the Save/Post buttons in the new way.
These changes are for changing the reverse link in the source document
when doing a POST of a local annotation. We also remove the local annotation.
To be done:
Clean the annotation index and the metadata related to a posted annotation.

Make remote annotation servers work in Windows

JK: Using XPointer in the context, instead of the Amaya labels

Make GetTempName() work under Windows the way we need it to work.

Rename GetFileSize to avoid a name conflict with Windows
(wonder if this really needs to be global, but keep it for now)

When posting an annotation, use a slightly better test for skipping
the prologue at the beginning of the generated document to account
for HTML and XHTML differences.  This repairs the new problem of
not well-formed annotation bodies.

JK: diverse bug fixes concerning the confusion between annot_url and
body_url.

JK and RRS : Safeguard commit before the demo
- New Timinificator easter egg
- Added an active reverse link to the document (a problem to jump to the
- name anchor seems to remain)
- Added a menu for changing the annotation types
- temporary hack to add a default type if it's missing
- we're now able to retrieve the body of a remote annotation.

Use datetime format from http://www.w3.org/TR/NOTE-datetime-970915.html
i.e. YYY-MM-DDTHH:MM:SS

JK: In the annotfilter, the author name is now shown as
author@annotation-server. Changed the selection logic. Enough for the demo,
but more work needs to be done in the interface.

JK: new AnnotFilter memory cleanup functions, called when closing, changing
documents.

JK: Added the BY_SERVER local annotation filter

JK: Connected the Hide/show menu to the BY_AUTHOR and BY_TYPE entries.
Added a label explaining the meaning of the '*' prefix.
Work to be done yet: filter by servers, cleaning the filters when changing
documents.

Check that the object for which we're adding a filter is non-NULL

JK: more work on the local filter. Added a * to say that an entry is
shown/hidden. Showing only one entry item even if it exists many times.
More work to be done yet!

JK: Added a toggle for showing/hiding all the annotations in a document.
Working on the general show/hide annotation menu (temporarily branched
on the CustomQuery menu).

RRS: fix parseType value to conform to RDF.  Maintain file:// in the
annot source_url consistently when annotating local resources.

JK: connected the Annotation configuration menu.
Added code to be able