Implemented the range handling code for XOVER

[citadel.git] / citadel / modules / nntp / serv_nntp.c

diff --git a/citadel/modules/nntp/serv_nntp.c b/citadel/modules/nntp/serv_nntp.c
index 78043d3fa12eb5f8a85b7a45709e57b545be2e67..e4897d6c3f3bbfe160729cc252debb3da5d91718 100644 (file)
--- a/citadel/modules/nntp/serv_nntp.c
+++ b/citadel/modules/nntp/serv_nntp.c
@@ -966,9 +966,35 @@ void nntp_last_next(const char *cmd) {
 void nntp_xover(const char *cmd) {
        if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
 
 void nntp_xover(const char *cmd) {
        if (CtdlAccessCheck(ac_logged_in_or_guest)) return;
 

-       // citnntp *nntpstate = (citnntp *) CC->session_specific_data;
+       citnntp *nntpstate = (citnntp *) CC->session_specific_data;
+       char range[256];
+       long lowest = (-1) ;
+       long highest = (-1) ; 
+
+       extract_token(range, cmd, 1, ' ', sizeof range);
+       lowest = atol(range);
+       if (lowest <= 0) {
+               lowest = nntpstate->current_article_number;
+               highest = nntpstate->current_article_number;
+       }
+       else {
+               char *dash = strchr(range, '-');
+               if (dash != NULL) {
+                       ++dash;
+                       highest = atol(dash);
+                       if (highest == 0) {
+                               highest = LONG_MAX;
+                       }
+                       if (highest < lowest) {
+                               highest = lowest;
+                       }
+               }
+               else {
+                       highest = lowest;
+               }
+       }

 
 

-       cprintf("500 not implemented yet FIXME\r\n");
+       cprintf("500 not implemented yet FIXME lowest=%ld highest=%ld\r\n", lowest, highest);

 }
 
 
 }